Merge remote-tracking branch 'upstream/pull/2919' into master

diff --combined .rubocop_todo.yml
index d70618e766295c2b5cb72271929d60db0bac136a,6b080f1130cc31522973dbcd6fc9cc06fd33422f..cfff8c43e2cd9459cb02f157d9bf5adf2f633db6
--- 1/.rubocop_todo.yml
--- 2/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -84,6 -84,21 +84,6 @@@ Metrics/PerceivedComplexity
  Minitest/MultipleAssertions:
    Max: 81
  
 -# Offense count: 26
 -# Cop supports --auto-correct.
 -Minitest/TestMethodName:
 -  Exclude:
 -    - 'test/abilities/api_capability_test.rb'
 -    - 'test/controllers/api/nodes_controller_test.rb'
 -    - 'test/controllers/api/old_nodes_controller_test.rb'
 -    - 'test/controllers/api/relations_controller_test.rb'
 -    - 'test/controllers/api/ways_controller_test.rb'
 -    - 'test/helpers/browse_helper_test.rb'
 -    - 'test/integration/client_applications_test.rb'
 -    - 'test/integration/short_links_test.rb'
 -    - 'test/integration/user_blocks_test.rb'
 -    - 'test/integration/user_creation_test.rb'
 -
  # Offense count: 6
  Naming/AccessorMethodName:
    Exclude:
@@@ -150,9 -165,6 +150,6 @@@ Rails/OutputSafety
    Exclude:
      - 'app/controllers/users_controller.rb'
      - 'app/helpers/application_helper.rb'
-     - 'app/helpers/changesets_helper.rb'
-     - 'app/helpers/geocoder_helper.rb'
-     - 'app/helpers/user_blocks_helper.rb'
      - 'lib/rich_text.rb'
      - 'test/helpers/application_helper_test.rb'