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

diff --git a/.rubocop.yml b/.rubocop.yml
index 5bf565c31f5060642551ea1c82dcd3d51740a3ef..7d2df0445445ab5f25f560eeb0cdea58a474f0c2 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -19,6 +19,10 @@ Lint/PercentStringArray:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/site_controller.rb'
 
+Metrics/BlockLength:
+  Exclude:
+    - 'config/routes.rb'
+
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 76a4cada2052e0d329e4dd2620795e173206ed6b..26b5aa64b8402baec153a5c6358fe5b37c596b3c 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -40,7 +40,7 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 263
+  Max: 71
 
 # Offense count: 15
 # Configuration parameters: CountBlocks.