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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 18bf69b9b85be093b8e2f81147cd08180a7d869a..1ae01086a36590d17fcb82ec3578b495fedfa618 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -35,7 +35,7 @@ Naming/FileName:
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 
 Rails/CreateTableWithTimestamps:
@@ -61,6 +61,9 @@ Rails/SkipsModelValidations:
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 
+Style/Documentation:
+  Enabled: false
+
 Style/FormatStringToken:
   EnforcedStyle: template