Update rubocop for compatibility with Code Climate

railsadminteam · Jul 27, 2016 · 91aa88b · 91aa88b
1 parent c865d22
commit 91aa88b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -41,6 +41,9 @@ Metrics/PerceivedComplexity:
 Style/AccessModifierIndentation:
   EnforcedStyle: outdent
 
+Style/Alias:
+  Enabled: false
+
 Style/CollectionMethods:
   PreferredMethods:
     map:      'collect'
@@ -76,7 +79,8 @@ Style/RaiseArgs:
 Style/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
-Style/TrailingComma:
+Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: 'comma'
 
-
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: 'comma'
diff --git a/Gemfile b/Gemfile
@@ -43,7 +43,7 @@ group :test do
   gem 'pundit'
   gem 'rack-cache', require: 'rack/cache'
   gem 'rspec-rails', '>= 2.14'
-  gem 'rubocop', '~> 0.31.0'
+  gem 'rubocop', '~> 0.41.2'
   gem 'simplecov', '>= 0.9', require: false
   gem 'timecop', '>= 0.5'