diff options
| author | Bart de Water <bartdewater@gmail.com> | 2018-04-21 13:13:34 -0400 |
|---|---|---|
| committer | Bart de Water <bartdewater@gmail.com> | 2018-04-21 13:18:50 -0400 |
| commit | e236454a1a7812898b60585e77cb7feae85a4ea4 (patch) | |
| tree | 0b58da547268b65322653bbb99b2738d17191198 | |
| parent | 611e1102d3bd46c4765bec7d57ca8d343c419e33 (diff) | |
| download | rails-e236454a1a7812898b60585e77cb7feae85a4ea4.tar.gz rails-e236454a1a7812898b60585e77cb7feae85a4ea4.tar.bz2 rails-e236454a1a7812898b60585e77cb7feae85a4ea4.zip | |
Rubocop 0.54
Fix `.rubocop.yml: Lint/EndAlignment has the wrong namespace - should be Layout` warning
| -rw-r--r-- | .codeclimate.yml | 2 | ||||
| -rw-r--r-- | .rubocop.yml | 14 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/.codeclimate.yml b/.codeclimate.yml index e4568d9d8b..7d4ec1c54f 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -23,7 +23,7 @@ checks: engines: rubocop: enabled: true - channel: rubocop-0-52 + channel: rubocop-0-54 ratings: paths: diff --git a/.rubocop.yml b/.rubocop.yml index afd5d6228d..954ab3b1cb 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -42,6 +42,13 @@ Layout/CommentIndentation: Layout/ElseAlignment: Enabled: true +# Align `end` with the matching keyword or starting expression except for +# assignments, where it should be aligned with the LHS. +Layout/EndAlignment: + Enabled: true + EnforcedStyleAlignWith: variable + AutoCorrect: true + Layout/EmptyLineAfterMagicComment: Enabled: true @@ -151,13 +158,6 @@ Layout/TrailingWhitespace: Style/UnneededPercentQ: Enabled: true -# Align `end` with the matching keyword or starting expression except for -# assignments, where it should be aligned with the LHS. -Lint/EndAlignment: - Enabled: true - EnforcedStyleAlignWith: variable - AutoCorrect: true - # Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg. Lint/RequireParentheses: Enabled: true diff --git a/Gemfile.lock b/Gemfile.lock index 23b668ac72..a0f823b6fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -333,7 +333,7 @@ GEM mini_portile2 (~> 2.3.0) os (0.9.6) parallel (1.12.1) - parser (2.5.0.2) + parser (2.5.1.0) ast (~> 2.4.0) path_expander (1.0.2) pg (1.0.0) @@ -385,9 +385,9 @@ GEM resque (~> 1.26) rufus-scheduler (~> 3.2) retriable (3.1.1) - rubocop (0.52.1) + rubocop (0.54.0) parallel (~> 1.10) - parser (>= 2.4.0.2, < 3.0) + parser (>= 2.5) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) @@ -470,7 +470,7 @@ GEM uber (0.1.0) uglifier (3.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.3.0) + unicode-display_width (1.3.2) useragent (0.16.8) vegas (0.1.11) rack (>= 1.0.0) |