From: Tom Hughes <tom@compton.nu>
Date: Sun, 18 Dec 2016 16:29:33 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1367'
X-Git-Tag: live~3633
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/970e1a99d7dce64f0631e88c5b9f060fb48d75fe

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

970e1a99d7dce64f0631e88c5b9f060fb48d75fe
diff --cc .rubocop_todo.yml
index f1e93f25b,b5834b8ce..a7b456aec
--- 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: 1659
 -  Max: 1653
++  Max: 1660
  
  # Offense count: 69
  Metrics/CyclomaticComplexity: