From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Oct 2024 18:05:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5246'
X-Git-Tag: live~109
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b935cd6fef56934c432bdce4c78a1c64b60755d1?ds=sidebyside;hp=-c

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

b935cd6fef56934c432bdce4c78a1c64b60755d1
diff --combined Gemfile
index 277346b83,26bc7c129..1e20da8d6
--- a/Gemfile
+++ b/Gemfile
@@@ -118,7 -118,8 +118,8 @@@ gem "dalli
  gem "kgio"
  
  # Load canonical-rails to generate canonical URLs
- gem "canonical-rails"
+ # Use unreleased version for rails 7.2.1+ compatibility
+ gem "canonical-rails", :github => "jumph4x/canonical-rails", :ref => "fbc1c88c"
  
  # Used to generate logstash friendly log files
  gem "logstasher"
@@@ -141,15 -142,10 +142,15 @@@ gem "image_processing
  # Used to validate widths
  gem "unicode-display_width"
  
 +# Lock some modules to old versions for ruby 3.1 support
 +gem "zeitwerk", "< 2.7"
 +
  # Gems useful for development
  group :development do
    gem "better_errors"
    gem "binding_of_caller"
 +  gem "danger"
 +  gem "danger-auto_label"
    gem "debug_inspector"
    gem "i18n-tasks"
    gem "listen"
@@@ -183,8 -179,6 +184,8 @@@ en
  
  group :development, :test do
    gem "annotate"
 +  gem "teaspoon"
 +  gem "teaspoon-mocha", "~> 2.3.3"
  
    # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
    gem "debug", :require => "debug/prelude"
diff --combined Gemfile.lock
index 4de807dcb,f77b81a5c..96be9e9e1
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -1,31 -1,39 +1,39 @@@
+ GIT
+   remote: https://github.com/jumph4x/canonical-rails.git
+   revision: fbc1c88c71131ddb1352953cd6048033fd2473e5
+   ref: fbc1c88c
+   specs:
+     canonical-rails (0.2.15)
+       actionview (>= 4.1, < 7.3)
+ 
  GEM
    remote: https://rubygems.org/
    specs:
      aasm (5.5.0)
        concurrent-ruby (~> 1.0)
-     actioncable (7.2.0)
-       actionpack (= 7.2.0)
-       activesupport (= 7.2.0)
+     actioncable (7.2.1)
+       actionpack (= 7.2.1)
+       activesupport (= 7.2.1)
        nio4r (~> 2.0)
        websocket-driver (>= 0.6.1)
        zeitwerk (~> 2.6)
-     actionmailbox (7.2.0)
-       actionpack (= 7.2.0)
-       activejob (= 7.2.0)
-       activerecord (= 7.2.0)
-       activestorage (= 7.2.0)
-       activesupport (= 7.2.0)
+     actionmailbox (7.2.1)
+       actionpack (= 7.2.1)
+       activejob (= 7.2.1)
+       activerecord (= 7.2.1)
+       activestorage (= 7.2.1)
+       activesupport (= 7.2.1)
        mail (>= 2.8.0)
-     actionmailer (7.2.0)
-       actionpack (= 7.2.0)
-       actionview (= 7.2.0)
-       activejob (= 7.2.0)
-       activesupport (= 7.2.0)
+     actionmailer (7.2.1)
+       actionpack (= 7.2.1)
+       actionview (= 7.2.1)
+       activejob (= 7.2.1)
+       activesupport (= 7.2.1)
        mail (>= 2.8.0)
        rails-dom-testing (~> 2.2)
-     actionpack (7.2.0)
-       actionview (= 7.2.0)
-       activesupport (= 7.2.0)
+     actionpack (7.2.1)
+       actionview (= 7.2.1)
+       activesupport (= 7.2.1)
        nokogiri (>= 1.8.5)
        racc
        rack (>= 2.2.4, < 3.2)
@@@ -36,39 -44,39 +44,39 @@@
        useragent (~> 0.16)
      actionpack-page_caching (1.2.4)
        actionpack (>= 4.0.0)
-     actiontext (7.2.0)
-       actionpack (= 7.2.0)
-       activerecord (= 7.2.0)
-       activestorage (= 7.2.0)
-       activesupport (= 7.2.0)
+     actiontext (7.2.1)
+       actionpack (= 7.2.1)
+       activerecord (= 7.2.1)
+       activestorage (= 7.2.1)
+       activesupport (= 7.2.1)
        globalid (>= 0.6.0)
        nokogiri (>= 1.8.5)
-     actionview (7.2.0)
-       activesupport (= 7.2.0)
+     actionview (7.2.1)
+       activesupport (= 7.2.1)
        builder (~> 3.1)
        erubi (~> 1.11)
        rails-dom-testing (~> 2.2)
        rails-html-sanitizer (~> 1.6)
      active_record_union (1.3.0)
        activerecord (>= 4.0)
-     activejob (7.2.0)
-       activesupport (= 7.2.0)
+     activejob (7.2.1)
+       activesupport (= 7.2.1)
        globalid (>= 0.3.6)
-     activemodel (7.2.0)
-       activesupport (= 7.2.0)
-     activerecord (7.2.0)
-       activemodel (= 7.2.0)
-       activesupport (= 7.2.0)
+     activemodel (7.2.1)
+       activesupport (= 7.2.1)
+     activerecord (7.2.1)
+       activemodel (= 7.2.1)
+       activesupport (= 7.2.1)
        timeout (>= 0.4.0)
      activerecord-import (1.8.1)
        activerecord (>= 4.2)
-     activestorage (7.2.0)
-       actionpack (= 7.2.0)
-       activejob (= 7.2.0)
-       activerecord (= 7.2.0)
-       activesupport (= 7.2.0)
+     activestorage (7.2.1)
+       actionpack (= 7.2.1)
+       activejob (= 7.2.1)
+       activerecord (= 7.2.1)
+       activesupport (= 7.2.1)
        marcel (~> 1.0)
-     activesupport (7.2.0)
+     activesupport (7.2.1)
        base64
        bigdecimal
        concurrent-ruby (~> 1.0, >= 1.3.1)
@@@ -91,7 -99,7 +99,7 @@@
      autoprefixer-rails (10.4.19.0)
        execjs (~> 2)
      aws-eventstream (1.3.0)
 -    aws-partitions (1.982.0)
 +    aws-partitions (1.990.0)
      aws-sdk-core (3.209.1)
        aws-eventstream (~> 1, >= 1.3.0)
        aws-partitions (~> 1, >= 1.651.0)
@@@ -100,7 -108,7 +108,7 @@@
      aws-sdk-kms (1.94.0)
        aws-sdk-core (~> 3, >= 3.207.0)
        aws-sigv4 (~> 1.5)
 -    aws-sdk-s3 (1.166.0)
 +    aws-sdk-s3 (1.167.0)
        aws-sdk-core (~> 3, >= 3.207.0)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.5)
@@@ -137,8 -145,6 +145,6 @@@
      bzip2-ffi (1.1.1)
        ffi (~> 1.0)
      cancancan (3.6.1)
-     canonical-rails (0.2.15)
-       actionview (>= 4.1, <= 7.2)
      capybara (3.40.0)
        addressable
        matrix
@@@ -150,40 -156,16 +156,40 @@@
        xpath (~> 3.2)
      childprocess (5.1.0)
        logger (~> 1.5)
 +    claide (1.1.0)
 +    claide-plugins (0.9.2)
 +      cork
 +      nap
 +      open4 (~> 1.3)
 +    colored2 (3.1.2)
      concurrent-ruby (1.3.4)
      config (5.5.2)
        deep_merge (~> 1.2, >= 1.2.1)
        ostruct
      connection_pool (2.4.1)
 +    cork (0.3.0)
 +      colored2 (~> 3.1)
      crack (1.0.0)
        bigdecimal
        rexml
      crass (1.0.6)
      dalli (3.2.8)
 +    danger (9.5.0)
 +      claide (~> 1.0)
 +      claide-plugins (>= 0.9.2)
 +      colored2 (~> 3.1)
 +      cork (~> 0.1)
 +      faraday (>= 0.9.0, < 3.0)
 +      faraday-http-cache (~> 2.0)
 +      git (~> 1.13)
 +      kramdown (~> 2.3)
 +      kramdown-parser-gfm (~> 1.0)
 +      octokit (>= 4.0)
 +      terminal-table (>= 1, < 4)
 +    danger-auto_label (1.3.1)
 +      danger-plugin-api (~> 1.0)
 +    danger-plugin-api (1.0.0)
 +      danger (> 2.0)
      dartsass-ruby (3.0.2)
        sass-embedded (~> 1.54, < 1.67)
      dartsass-sprockets (3.0.0)
@@@ -264,8 -246,6 +270,8 @@@
        faraday-net_http (>= 2.0, < 3.4)
        json
        logger
 +    faraday-http-cache (2.5.1)
 +      faraday (>= 0.8)
      faraday-net_http (3.3.0)
        net-http
      ffi (1.17.0)
@@@ -280,9 -260,6 +286,9 @@@
      fspath (3.1.2)
      gd2-ffij (0.4.0)
        ffi (>= 1.0.0)
 +    git (1.19.1)
 +      addressable (~> 2.8)
 +      rchardet (~> 1.8)
      globalid (1.2.1)
        activesupport (>= 6.1)
      google-protobuf (3.25.5)
@@@ -335,13 -312,11 +341,13 @@@
        railties (>= 4.2.0)
        thor (>= 0.14, < 2.0)
      json (2.7.2)
 -    jwt (2.9.1)
 +    jwt (2.9.3)
        base64
      kgio (2.11.4)
      kramdown (2.4.0)
        rexml
 +    kramdown-parser-gfm (1.1.0)
 +      kramdown (~> 2.0)
      language_server-protocol (3.17.0.3)
      libv8-node (18.19.0.0)
      libxml-ruby (5.0.3)
@@@ -371,14 -346,13 +377,14 @@@
      minitest (5.25.1)
      minitest-focus (1.4.0)
        minitest (>= 4, < 6)
 -    msgpack (1.7.2)
 +    msgpack (1.7.3)
      multi_json (1.15.0)
      multi_xml (0.7.1)
        bigdecimal (~> 3.1)
 +    nap (1.1.0)
      net-http (0.4.1)
        uri
 -    net-imap (0.4.16)
 +    net-imap (0.4.17)
        date
        net-protocol
      net-pop (0.1.2)
@@@ -404,9 -378,6 +410,9 @@@
        rack (>= 1.2, < 4)
        snaky_hash (~> 2.0)
        version_gem (~> 1.1)
 +    octokit (9.1.0)
 +      faraday (>= 1, < 3)
 +      sawyer (~> 0.9)
      omniauth (2.0.4)
        hashie (>= 3.4.6)
        rack (>= 1.6.2, < 3)
@@@ -442,7 -413,6 +448,7 @@@
      omniauth-rails_csrf_protection (1.0.2)
        actionpack (>= 4.2)
        omniauth (~> 2.0)
 +    open4 (1.3.4)
      openstreetmap-deadlock_retry (1.3.1)
      ostruct (0.6.0)
      overcommit (0.64.0)
@@@ -463,7 -433,7 +469,7 @@@
        nio4r (~> 2.0)
      quad_tile (1.0.1)
      racc (1.8.1)
 -    rack (2.2.9)
 +    rack (2.2.10)
      rack-cors (2.0.2)
        rack (>= 2.0.0)
      rack-openid (1.4.2)
@@@ -480,20 -450,20 +486,20 @@@
      rackup (1.0.0)
        rack (< 3)
        webrick
-     rails (7.2.0)
-       actioncable (= 7.2.0)
-       actionmailbox (= 7.2.0)
-       actionmailer (= 7.2.0)
-       actionpack (= 7.2.0)
-       actiontext (= 7.2.0)
-       actionview (= 7.2.0)
-       activejob (= 7.2.0)
-       activemodel (= 7.2.0)
-       activerecord (= 7.2.0)
-       activestorage (= 7.2.0)
-       activesupport (= 7.2.0)
+     rails (7.2.1)
+       actioncable (= 7.2.1)
+       actionmailbox (= 7.2.1)
+       actionmailer (= 7.2.1)
+       actionpack (= 7.2.1)
+       actiontext (= 7.2.1)
+       actionview (= 7.2.1)
+       activejob (= 7.2.1)
+       activemodel (= 7.2.1)
+       activerecord (= 7.2.1)
+       activestorage (= 7.2.1)
+       activesupport (= 7.2.1)
        bundler (>= 1.15.0)
-       railties (= 7.2.0)
+       railties (= 7.2.1)
      rails-controller-testing (1.0.5)
        actionpack (>= 5.0.1.rc1)
        actionview (>= 5.0.1.rc1)
@@@ -511,9 -481,9 +517,9 @@@
      rails_param (1.3.1)
        actionpack (>= 3.2.0)
        activesupport (>= 3.2.0)
-     railties (7.2.0)
-       actionpack (= 7.2.0)
-       activesupport (= 7.2.0)
+     railties (7.2.1)
+       actionpack (= 7.2.1)
+       activesupport (= 7.2.1)
        irb (~> 1.13)
        rackup (>= 1.0.0)
        rake (>= 12.2)
@@@ -524,7 -494,6 +530,7 @@@
      rb-fsevent (0.11.2)
      rb-inotify (0.11.1)
        ffi (~> 1.0)
 +    rchardet (1.8.0)
      rdoc (6.7.0)
        psych (>= 4.0.0)
      regexp_parser (2.9.2)
@@@ -538,7 -507,7 +544,7 @@@
      rouge (4.4.0)
      rtlcss (0.2.1)
        mini_racer (>= 0.6.3)
 -    rubocop (1.66.1)
 +    rubocop (1.67.0)
        json (~> 2.3)
        language_server-protocol (>= 3.17.0)
        parallel (~> 1.10)
@@@ -579,11 -548,8 +585,11 @@@
      sass-embedded (1.64.2)
        google-protobuf (~> 3.23)
        rake (>= 13.0.0)
 +    sawyer (0.9.2)
 +      addressable (>= 2.3.5)
 +      faraday (>= 0.17.3, < 3)
      securerandom (0.3.1)
-     selenium-webdriver (4.23.0)
+     selenium-webdriver (4.25.0)
        base64 (~> 0.2)
        logger (~> 1.4)
        rexml (~> 3.2, >= 3.2.5)
@@@ -614,18 -580,14 +620,18 @@@
      stringio (3.1.1)
      strong_migrations (1.8.0)
        activerecord (>= 5.2)
 +    teaspoon (1.2.2)
 +      railties (>= 3.2.5)
 +    teaspoon-mocha (2.3.3)
 +      teaspoon (>= 1.0.0)
      terminal-table (3.0.2)
        unicode-display_width (>= 1.1.1, < 3)
 -    terser (1.2.3)
 +    terser (1.2.4)
        execjs (>= 0.3.0, < 3)
      thor (1.3.2)
      tilt (2.4.0)
      timeout (0.4.1)
 -    turbo-rails (2.0.10)
 +    turbo-rails (2.0.11)
        actionpack (>= 6.0.0)
        railties (>= 6.0.0)
      tzinfo (2.0.6)
@@@ -673,13 -635,11 +679,13 @@@ DEPENDENCIE
    browser (< 6)
    bzip2-ffi
    cancancan
-   canonical-rails
+   canonical-rails!
    capybara (>= 2.15)
    config
    connection_pool
    dalli
 +  danger
 +  danger-auto_label
    dartsass-sprockets
    debug
    debug_inspector
@@@ -752,15 -712,12 +758,15 @@@
    simplecov-lcov
    sprockets-exporters_pack
    strong_migrations (< 2.0.0)
 +  teaspoon
 +  teaspoon-mocha (~> 2.3.3)
    terser
    turbo-rails
    unicode-display_width
    validates_email_format_of (>= 1.5.1)
    vendorer
    webmock
 +  zeitwerk (< 2.7)
  
  BUNDLED WITH
 -   2.5.11
 +   2.5.16