From: Tom Hughes <tom@compton.nu>
Date: Mon, 24 Feb 2025 17:11:58 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5726'
X-Git-Tag: live~8
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/599217dfb64843d5c85271fef871cd64881bdf08?ds=sidebyside;hp=-c

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

599217dfb64843d5c85271fef871cd64881bdf08
diff --combined .rubocop.yml
index c3f4a2bc8,2cba82bb5..64a8d0a0f
--- a/.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'