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

author Tom Hughes <tom@compton.nu>

Sun, 30 Oct 2016 16:59:20 +0000 (16:59 +0000)

committer Tom Hughes <tom@compton.nu>

Sun, 30 Oct 2016 16:59:20 +0000 (16:59 +0000)
author Tom Hughes <tom@compton.nu>
Sun, 30 Oct 2016 16:59:20 +0000 (16:59 +0000)
committer Tom Hughes <tom@compton.nu>
Sun, 30 Oct 2016 16:59:20 +0000 (16:59 +0000)
diff --cc .rubocop_todo.yml

index 83d561ef1f9a16827a9f652b9405b5f612976f3a,b5834b8ce4ad2f968579b137f07bcfe8d23108e0..f1e93f25bfb4cca9988b86bdde67827752574757
--- 1/.rubocop_todo.yml
--- 2/.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:
diff --cc test/controllers/changeset_controller_test.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Sun, 30 Oct 2016 16:59:20 +0000 (16:59 +0000)
committer	Tom Hughes <tom@compton.nu>
	Sun, 30 Oct 2016 16:59:20 +0000 (16:59 +0000)
		1	2
.rubocop_todo.yml	patch \|	diff1 \|	diff2 \|	blob \| history
test/controllers/changeset_controller_test.rb	patch \|	diff1 \|	diff2 \|	blob \| history