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

diff --cc .rubocop_todo.yml
index 4e0bad7f9650eff28c271ffcd6a51f7ee9b8a0f2,96bf94b8e6241dd49d91d310ad1197385caacda0..2a960db7a109bc44bca80d2b71124f1eaae64c47
--- 1/.rubocop_todo.yml
--- 2/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -173,7 -173,36 +173,20 @@@ Style/FrozenStringLiteralComment
  Style/NumericLiterals:
    MinDigits: 11
  
- # Offense count: 28
 -# Offense count: 20
 -Style/OptionalBooleanParameter:
 -  Exclude:
 -    - 'app/controllers/api/notes_controller.rb'
 -    - 'app/controllers/application_controller.rb'
 -    - 'app/helpers/browse_helper.rb'
 -    - 'app/models/changeset.rb'
 -    - 'app/models/node.rb'
 -    - 'app/models/relation.rb'
 -    - 'app/models/trace.rb'
 -    - 'app/models/tracepoint.rb'
 -    - 'app/models/way.rb'
 -    - 'test/models/diary_entry_test.rb'
 -    - 'test/models/trace_test.rb'
 -    - 'test/models/tracetag_test.rb'
 -
+ # Offense count: 19
  # Cop supports --auto-correct.
  Style/StringConcatenation:
-   Enabled: false
+   Exclude:
+     - 'app/helpers/browse_tags_helper.rb'
+     - 'app/helpers/user_roles_helper.rb'
+     - 'app/jobs/trace_importer_job.rb'
+     - 'app/models/client_application.rb'
+     - 'app/views/changesets/index.atom.builder'
+     - 'lib/migrate.rb'
+     - 'lib/potlatch.rb'
+     - 'script/cleanup'
+     - 'script/deliver-message'
+     - 'script/statistics'
+     - 'script/update-spam-blocks'
+     - 'test/controllers/api/relations_controller_test.rb'
+     - 'test/helpers/user_roles_helper_test.rb'