Merge remote-tracking branch 'upstream/pull/1958'

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index e12437e080c3d8f0d81731537acf0847ecfbf8bf..24d57fb37cc0b354c71674e00c8a6f9671bbdf6b 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -63,6 +63,11 @@ Style/HashSyntax:
     - 'lib/tasks/testing.rake'
     - 'config/initializers/wrap_parameters.rb'
 
+Style/MixinUsage:
+  Exclude:
+    - 'bin/setup'
+    - 'bin/update'
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes