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

diff --cc .rubocop_todo.yml
index f1e93f25bfb4cca9988b86bdde67827752574757,b5834b8ce4ad2f968579b137f07bcfe8d23108e0..a7b456aec43f5031f88cfa8d28b508aaaeeb61f9
--- 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: 1659
 -  Max: 1653
++  Max: 1660
  
  # Offense count: 69
  Metrics/CyclomaticComplexity:

diff --cc test/controllers/changeset_controller_test.rb
Simple merge

diff --cc test/test_helper.rb
Simple merge