aboutsummaryrefslogtreecommitdiffstats
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-07-15 21:17:27 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2017-07-15 21:17:27 +0200
commitaad42dce10a9cc110d67fa03a72ce5b41cbb394a (patch)
tree7c22623e9f34f2ff7bfa142385010b6a4e5aea85 /.rubocop.yml
parent92fb8621a623afb33a145b1f3736010a3c870086 (diff)
parentb6300f3ecc79bff29cf9bb804a30fd92403feac1 (diff)
downloadrails-aad42dce10a9cc110d67fa03a72ce5b41cbb394a.tar.gz
rails-aad42dce10a9cc110d67fa03a72ce5b41cbb394a.tar.bz2
rails-aad42dce10a9cc110d67fa03a72ce5b41cbb394a.zip
Merge branch 'master' into unlock-minitest
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 8a0c55d5d4..b8b3eb8eea 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -77,6 +77,13 @@ Layout/SpaceBeforeFirstArg:
Style/MethodDefParentheses:
Enabled: true
+Style/FrozenStringLiteralComment:
+ Enabled: true
+ EnforcedStyle: always
+ Include:
+ - 'activesupport/**/*'
+ - 'activejob/**/*'
+
# Use `foo {}` not `foo{}`.
Layout/SpaceBeforeBlockBraces:
Enabled: true