diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-04-22 13:27:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 13:27:36 +0900 |
| commit | 222f20eb192e4ec2f19d19cc37dc3ca601d55c8d (patch) | |
| tree | 89b93b757bdf21dee09e2f1a12e0ff68fd157fbc /.rubocop.yml | |
| parent | 26749d37fa7ceb4d1a9d98147029145e9aabfa40 (diff) | |
| parent | 999e7ec505d8088b3bd82298750c0f1d0043cede (diff) | |
| download | rails-222f20eb192e4ec2f19d19cc37dc3ca601d55c8d.tar.gz rails-222f20eb192e4ec2f19d19cc37dc3ca601d55c8d.tar.bz2 rails-222f20eb192e4ec2f19d19cc37dc3ca601d55c8d.zip | |
Merge pull request #32681 from bdewater/rubocop-0-54
Rubocop 0.54
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 14 |
1 files changed, 7 insertions, 7 deletions
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 |