Merge remote-tracking branch 'openstreetmap/pull/1352'
authorTom Hughes <tom@compton.nu>
Sun, 30 Oct 2016 16:59:20 +0000 (16:59 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 30 Oct 2016 16:59:20 +0000 (16:59 +0000)
1  2 
.rubocop_todo.yml
test/controllers/changeset_controller_test.rb

@@@ -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: