diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-08-01 17:34:14 -0400 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-08-01 17:34:14 -0400 |
| commit | feb1ddae021c38174f9c22bbd1298c8b73431b45 (patch) | |
| tree | 09a38695596cf80dc362dd4d93cf94d6f7415e7b /.rubocop.yml | |
| parent | 3540e60c385286f3517ff56270b31a91ed3024a3 (diff) | |
| parent | f9a43f28c087f8ffd35ff7c33a60c938b60f2be2 (diff) | |
| download | rails-feb1ddae021c38174f9c22bbd1298c8b73431b45.tar.gz rails-feb1ddae021c38174f9c22bbd1298c8b73431b45.tar.bz2 rails-feb1ddae021c38174f9c22bbd1298c8b73431b45.zip | |
Merge remote-tracking branch 'origin/master' into unlock-minitest
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index b8b3eb8eea..0408ca4aa1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -25,6 +25,9 @@ Layout/CaseIndentation: Layout/CommentIndentation: Enabled: true +Layout/EmptyLineAfterMagicComment: + Enabled: true + # No extra empty lines. Layout/EmptyLines: Enabled: true @@ -41,6 +44,9 @@ Layout/EmptyLinesAroundMethodBody: Layout/EmptyLinesAroundModuleBody: Enabled: true +Layout/FirstParameterIndentation: + Enabled: true + # Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }. Style/HashSyntax: Enabled: true @@ -82,7 +88,18 @@ Style/FrozenStringLiteralComment: EnforcedStyle: always Include: - 'activesupport/**/*' + - 'activemodel/**/*' + - 'actioncable/**/*' - 'activejob/**/*' + - 'activerecord/**/*' + - 'actionmailer/**/*' + - 'actionview/**/*' + - 'actionpack/**/*' + Exclude: + - 'actionview/test/**/*.builder' + - 'actionview/test/**/*.ruby' + - 'actionpack/test/**/*.builder' + - 'actionpack/test/**/*.ruby' # Use `foo {}` not `foo{}`. Layout/SpaceBeforeBlockBraces: |