Merge remote-tracking branch 'upstream/pull/5726'

diff --combined .rubocop.yml
index c3f4a2bc8b4c8b4181054932567820eb59132a8a,2cba82bb519e619844bf23f249b8f5bf890d154f..64a8d0a0f04509b6dad14174ab882718d524f452
--- 1/.rubocop.yml
--- 2/.rubocop.yml
+++ b/.rubocop.yml
@@@ -12,7 -12,7 +12,7 @@@ require
    - ./.rubocop/specific_action_names.rb
  
  AllCops:
 -  TargetRubyVersion: 3.1
 +  TargetRubyVersion: 3.2
    NewCops: enable
    Exclude:
      - 'vendor/**/*'
@@@ -108,10 -108,6 +108,10 @@@ Style/MixinUsage
      - 'bin/setup'
      - 'bin/update'
  
 +Style/RaiseArgs:
 +  Exclude:
 +    - 'lib/osm.rb'
 +
  Style/StringLiterals:
    EnforcedStyle: double_quotes
  
@@@ -133,7 -129,6 +133,6 @@@ Rails/SpecificActionNames
      - app/controllers/**/*.rb
    Exclude:
      # This is a todo list, but is currently too long for `rubocop --auto-gen-config`
-     - 'app/controllers/api/changeset_comments_controller.rb'
      - 'app/controllers/api/changesets_controller.rb'
      - 'app/controllers/api/notes_controller.rb'
      - 'app/controllers/api/user_preferences_controller.rb'