Skip to content

Commit

Permalink
Fix obsolete Rubocop configuration
Browse files Browse the repository at this point in the history
The DefaultScope cop was removed:

rubocop/rubocop#1895

The TrailingComma cop was split into two:

rubocop/rubocop@a0719f9
  • Loading branch information
jferris committed Apr 18, 2016
1 parent 98a3ec9 commit 00fe609
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions style/ruby/.rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -334,12 +334,23 @@ Style/StringLiterals:
EnforcedStyle: double_quotes
Enabled: true

Style/TrailingComma:
Description: 'Checks for trailing comma in parameter lists and literals.'
Style/TrailingCommaInArguments:
Description: 'Checks for trailing comma in argument lists.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
EnforcedStyleForMultiline: comma
SupportedStyles:
- comma
- consistent_comma
- no_comma
Enabled: true

Style/TrailingCommaInLiteral:
Description: 'Checks for trailing comma in array and hash literals.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
EnforcedStyleForMultiline: comma
SupportedStyles:
- comma
- consistent_comma
- no_comma
Enabled: true

Expand Down Expand Up @@ -560,10 +571,6 @@ Rails/Date:
such as Date.today, Date.current etc.
Enabled: false

Rails/DefaultScope:
Description: 'Checks if the argument passed to default_scope is a block.'
Enabled: false

Rails/FindBy:
Description: 'Prefer find_by over where.first.'
Enabled: false
Expand Down

0 comments on commit 00fe609

Please sign in to comment.