From: Tom Hughes <tom@compton.nu>
Date: Wed, 5 Jun 2019 16:18:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2250'
X-Git-Tag: live~3159
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a8d0a64b2a32ba9a914bc1029dbcb163385737d3?hp=5bb21188e46eaf2496d041220409416562a43a00

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

diff --git a/.rubocop.yml b/.rubocop.yml
index 5bf565c31..7d2df0445 100644
--- 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 76a4cada2..26b5aa64b 100644
--- 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.