From 59625652faa253ade3741f01e1fce07085878aba Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Sat, 16 Jan 2016 13:56:10 -0800
Subject: [PATCH] Update rubocop to version 0.36.0

---
 .rubocop.yml | 6 ++++--
 Gemfile.lock | 8 ++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index ffd0357..88616fa 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,11 +1,13 @@
 AllCops:
-  RunRailsCops: true
   Exclude:
     - 'bin/*'
     - 'db/schema.rb'
     - 'db/seeds.rb'
     - 'vendor/bundle/**/*'
 
+Rails:
+  Enabled: true
+
 Metrics/AbcSize:
   Exclude:
     - 'app/controllers/passwords_controller.rb'
@@ -51,7 +53,7 @@ Style/DoubleNegation:
 Style/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: 'comma'
 
 Style/WordArray:
diff --git a/Gemfile.lock b/Gemfile.lock
index 217e6dd..92784b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,8 +39,6 @@ GEM
     addressable (2.4.0)
     arel (6.0.3)
     ast (2.2.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
     bcrypt (3.1.10)
     builder (3.2.2)
     coffee-rails (4.1.1)
@@ -170,13 +168,11 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
+    rubocop (0.36.0)
+      parser (>= 2.3.0.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
     ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
     sass (3.4.21)