Merge remote-tracking branch 'openstreetmap/pull/1367'
authorTom Hughes <tom@compton.nu>
Sun, 18 Dec 2016 16:29:33 +0000 (16:29 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 18 Dec 2016 16:29:33 +0000 (16:29 +0000)
1  2 
.rubocop_todo.yml
test/controllers/changeset_controller_test.rb
test/test_helper.rb

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