From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Jun 2018 13:51:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1892'
X-Git-Tag: live~3588
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ba9a00b10cc8a075a5a4090a1601e3d3b72b2ec1?ds=sidebyside

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

ba9a00b10cc8a075a5a4090a1601e3d3b72b2ec1
diff --cc .rubocop_todo.yml
index 83f60d4f8,2f6ea0087..362cfcb32
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -67,7 -67,7 +67,7 @@@ Metrics/AbcSize
  # Offense count: 41
  # Configuration parameters: CountComments, ExcludedMethods.
  Metrics/BlockLength:
-   Max: 245
 -  Max: 241
++  Max: 247
  
  # Offense count: 12
  # Configuration parameters: CountBlocks.