From: Tom Hughes <tom@compton.nu>
Date: Sun, 30 Oct 2016 16:59:20 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1352'
X-Git-Tag: live~3699
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fc0aebc1a8ccad4ae9a3ac6435df00328e5a98e5?ds=sidebyside

Merge remote-tracking branch 'openstreetmap/pull/1352'
---

fc0aebc1a8ccad4ae9a3ac6435df00328e5a98e5
diff --cc .rubocop_todo.yml
index 83d561ef1,b5834b8ce..f1e93f25b
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -64,7 -64,7 +64,7 @@@ Metrics/BlockNesting
  # Offense count: 62
  # Configuration parameters: CountComments.
  Metrics/ClassLength:
-   Max: 1658
 -  Max: 1653
++  Max: 1659
  
  # Offense count: 69
  Metrics/CyclomaticComplexity: