diff --git a/.rubocop.yml b/.rubocop.yml index 268d835a..03fed3f7 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -9,12 +9,6 @@ AllCops: Style/AndOr: Enabled: true -# Do not use braces for hash literals when they are the last argument of a -# method call. -Style/BracesAroundHashParameters: - Enabled: true - EnforcedStyle: context_dependent - # Align `when` with `case`. Layout/CaseIndentation: Enabled: true @@ -45,7 +39,7 @@ Layout/EmptyLinesAroundMethodBody: Layout/EmptyLinesAroundModuleBody: Enabled: true -Layout/IndentFirstArgument: +Layout/FirstArgumentIndentation: Enabled: true # Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }. @@ -122,7 +116,7 @@ Layout/Tab: Enabled: true # Blank lines should not have any spaces. -Layout/TrailingBlankLines: +Layout/TrailingEmptyLines: Enabled: true # No trailing whitespace. diff --git a/Gemfile b/Gemfile index 88d62f29..f242676e 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "http://rubygems.org" group :development do gem "juwelier", "~> 2.0" gem "rspec_junit_formatter" - gem "rubocop", require: false + gem "rubocop", "0.81", require: false gem "rubocop-performance", require: false gem "rubocop-rails", require: false end