From: Tom Hughes <tom@compton.nu>
Date: Tue, 24 Oct 2023 16:37:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4262'
X-Git-Tag: live~1405
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/dd905b5aa893918168c644045aa1b6069e95d48e?ds=inline;hp=-c

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

dd905b5aa893918168c644045aa1b6069e95d48e
diff --combined Gemfile
index 7076b8c1f,8be817547..8f0d29d5a
--- a/Gemfile
+++ b/Gemfile
@@@ -1,7 -1,7 +1,7 @@@
  source "https://rubygems.org"
  
  # Require rails
 -gem "rails", "~> 7.0.0"
 +gem "rails", "~> 7.1.0"
  
  # Require json for multi_json
  gem "json"
@@@ -45,9 -45,10 +45,9 @@@ gem "sprockets-exporters_pack
  gem "actionpack-page_caching", ">= 1.2.0"
  gem "activerecord-import"
  gem "active_record_union"
- gem "bootstrap", :github => "gravitystorm/bootstrap-rubygem", :branch => "dartsass_5_2_3"
+ gem "bootstrap", :github => "twbs/bootstrap-rubygem", :ref => "fde1edff90d9219bbef48ecc6a65f13835269bcd"
  gem "bootstrap_form", "~> 5.0"
  gem "cancancan"
 -gem "composite_primary_keys", "~> 14.0.0"
  gem "config"
  gem "delayed_job_active_record"
  gem "frozen_record"
@@@ -80,7 -81,6 +80,7 @@@ gem "omniauth-rails_csrf_protection", "
  # Doorkeeper for OAuth2
  gem "doorkeeper"
  gem "doorkeeper-i18n"
 +gem "doorkeeper-openid_connect"
  
  # Markdown formatting support
  gem "kramdown"
@@@ -135,6 -135,7 +135,6 @@@ gem "image_processing
  
  # Gems useful for development
  group :development do
 -  gem "annotate"
    gem "better_errors"
    gem "binding_of_caller"
    gem "debug_inspector"
@@@ -149,7 -150,6 +149,7 @@@ group :test d
    gem "capybara", ">= 2.15"
    gem "erb_lint", :require => false
    gem "factory_bot_rails"
 +  gem "jwt"
    gem "minitest", "~> 5.1"
    gem "puma", "~> 5.6"
    gem "rails-controller-testing"
@@@ -165,7 -165,3 +165,7 @@@
    gem "simplecov-lcov", :require => false
    gem "webmock"
  end
 +
 +group :development, :test do
 +  gem "annotate"
 +end
diff --combined Gemfile.lock
index 1a96a9e96,7438ec809..80f7b2936
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -1,95 -1,87 +1,95 @@@
  GIT
-   remote: https://github.com/gravitystorm/bootstrap-rubygem.git
-   revision: 7bd2caa8a2897a55892915a789d4e020906adb60
-   branch: dartsass_5_2_3
+   remote: https://github.com/twbs/bootstrap-rubygem.git
+   revision: fde1edff90d9219bbef48ecc6a65f13835269bcd
+   ref: fde1edff90d9219bbef48ecc6a65f13835269bcd
    specs:
-     bootstrap (5.2.3)
+     bootstrap (5.3.1)
        autoprefixer-rails (>= 9.1.0)
-       popper_js (>= 2.11.6, < 3)
+       popper_js (>= 2.11.8, < 3)
  
  GEM
    remote: https://rubygems.org/
    specs:
      aasm (5.5.0)
        concurrent-ruby (~> 1.0)
 -    actioncable (7.0.8)
 -      actionpack (= 7.0.8)
 -      activesupport (= 7.0.8)
 +    actioncable (7.1.1)
 +      actionpack (= 7.1.1)
 +      activesupport (= 7.1.1)
        nio4r (~> 2.0)
        websocket-driver (>= 0.6.1)
 -    actionmailbox (7.0.8)
 -      actionpack (= 7.0.8)
 -      activejob (= 7.0.8)
 -      activerecord (= 7.0.8)
 -      activestorage (= 7.0.8)
 -      activesupport (= 7.0.8)
 +      zeitwerk (~> 2.6)
 +    actionmailbox (7.1.1)
 +      actionpack (= 7.1.1)
 +      activejob (= 7.1.1)
 +      activerecord (= 7.1.1)
 +      activestorage (= 7.1.1)
 +      activesupport (= 7.1.1)
        mail (>= 2.7.1)
        net-imap
        net-pop
        net-smtp
 -    actionmailer (7.0.8)
 -      actionpack (= 7.0.8)
 -      actionview (= 7.0.8)
 -      activejob (= 7.0.8)
 -      activesupport (= 7.0.8)
 +    actionmailer (7.1.1)
 +      actionpack (= 7.1.1)
 +      actionview (= 7.1.1)
 +      activejob (= 7.1.1)
 +      activesupport (= 7.1.1)
        mail (~> 2.5, >= 2.5.4)
        net-imap
        net-pop
        net-smtp
 -      rails-dom-testing (~> 2.0)
 -    actionpack (7.0.8)
 -      actionview (= 7.0.8)
 -      activesupport (= 7.0.8)
 -      rack (~> 2.0, >= 2.2.4)
 +      rails-dom-testing (~> 2.2)
 +    actionpack (7.1.1)
 +      actionview (= 7.1.1)
 +      activesupport (= 7.1.1)
 +      nokogiri (>= 1.8.5)
 +      rack (>= 2.2.4)
 +      rack-session (>= 1.0.1)
        rack-test (>= 0.6.3)
 -      rails-dom-testing (~> 2.0)
 -      rails-html-sanitizer (~> 1.0, >= 1.2.0)
 +      rails-dom-testing (~> 2.2)
 +      rails-html-sanitizer (~> 1.6)
      actionpack-page_caching (1.2.4)
        actionpack (>= 4.0.0)
 -    actiontext (7.0.8)
 -      actionpack (= 7.0.8)
 -      activerecord (= 7.0.8)
 -      activestorage (= 7.0.8)
 -      activesupport (= 7.0.8)
 +    actiontext (7.1.1)
 +      actionpack (= 7.1.1)
 +      activerecord (= 7.1.1)
 +      activestorage (= 7.1.1)
 +      activesupport (= 7.1.1)
        globalid (>= 0.6.0)
        nokogiri (>= 1.8.5)
 -    actionview (7.0.8)
 -      activesupport (= 7.0.8)
 +    actionview (7.1.1)
 +      activesupport (= 7.1.1)
        builder (~> 3.1)
 -      erubi (~> 1.4)
 -      rails-dom-testing (~> 2.0)
 -      rails-html-sanitizer (~> 1.1, >= 1.2.0)
 +      erubi (~> 1.11)
 +      rails-dom-testing (~> 2.2)
 +      rails-html-sanitizer (~> 1.6)
      active_record_union (1.3.0)
        activerecord (>= 4.0)
 -    activejob (7.0.8)
 -      activesupport (= 7.0.8)
 +    activejob (7.1.1)
 +      activesupport (= 7.1.1)
        globalid (>= 0.3.6)
 -    activemodel (7.0.8)
 -      activesupport (= 7.0.8)
 -    activerecord (7.0.8)
 -      activemodel (= 7.0.8)
 -      activesupport (= 7.0.8)
 +    activemodel (7.1.1)
 +      activesupport (= 7.1.1)
 +    activerecord (7.1.1)
 +      activemodel (= 7.1.1)
 +      activesupport (= 7.1.1)
 +      timeout (>= 0.4.0)
      activerecord-import (1.5.0)
        activerecord (>= 4.2)
 -    activestorage (7.0.8)
 -      actionpack (= 7.0.8)
 -      activejob (= 7.0.8)
 -      activerecord (= 7.0.8)
 -      activesupport (= 7.0.8)
 +    activestorage (7.1.1)
 +      actionpack (= 7.1.1)
 +      activejob (= 7.1.1)
 +      activerecord (= 7.1.1)
 +      activesupport (= 7.1.1)
        marcel (~> 1.0)
 -      mini_mime (>= 1.1.0)
 -    activesupport (7.0.8)
 +    activesupport (7.1.1)
 +      base64
 +      bigdecimal
        concurrent-ruby (~> 1.0, >= 1.0.2)
 +      connection_pool (>= 2.2.5)
 +      drb
        i18n (>= 1.6, < 2)
        minitest (>= 5.1)
 +      mutex_m
        tzinfo (~> 2.0)
      addressable (2.8.5)
        public_suffix (>= 2.0.2, < 6.0)
@@@ -103,16 -95,16 +103,16 @@@
      autoprefixer-rails (10.4.15.0)
        execjs (~> 2)
      aws-eventstream (1.2.0)
 -    aws-partitions (1.828.0)
 -    aws-sdk-core (3.183.1)
 +    aws-partitions (1.840.0)
 +    aws-sdk-core (3.185.1)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.651.0)
        aws-sigv4 (~> 1.5)
        jmespath (~> 1, >= 1.6.1)
 -    aws-sdk-kms (1.71.0)
 -      aws-sdk-core (~> 3, >= 3.177.0)
 +    aws-sdk-kms (1.72.0)
 +      aws-sdk-core (~> 3, >= 3.184.0)
        aws-sigv4 (~> 1.1)
 -    aws-sdk-s3 (1.135.0)
 +    aws-sdk-s3 (1.136.0)
        aws-sdk-core (~> 3, >= 3.181.0)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.6)
@@@ -130,7 -122,6 +130,7 @@@
        erubi (~> 1.4)
        parser (>= 2.4)
        smart_properties
 +    bigdecimal (3.1.4)
      binding_of_caller (1.0.0)
        debug_inspector (>= 0.0.1)
      bootsnap (1.16.0)
@@@ -145,8 -136,8 +145,8 @@@
      bzip2-ffi (1.1.1)
        ffi (~> 1.0)
      cancancan (3.5.0)
 -    canonical-rails (0.2.14)
 -      rails (>= 4.1, <= 7.1)
 +    canonical-rails (0.2.15)
 +      actionview (>= 4.1, <= 7.2)
      capybara (3.39.2)
        addressable
        matrix
@@@ -156,8 -147,10 +156,8 @@@
        rack-test (>= 0.6.3)
        regexp_parser (>= 1.5, < 3.0)
        xpath (~> 3.2)
 -    composite_primary_keys (14.0.6)
 -      activerecord (~> 7.0.2)
      concurrent-ruby (1.2.2)
 -    config (4.2.1)
 +    config (5.0.0)
        deep_merge (~> 1.2, >= 1.2.1)
        dry-validation (~> 1.0, >= 1.0.0)
      connection_pool (2.4.1)
@@@ -178,19 -171,14 +178,19 @@@
      deep_merge (1.2.2)
      delayed_job (4.1.11)
        activesupport (>= 3.0, < 8.0)
 -    delayed_job_active_record (4.1.7)
 +    delayed_job_active_record (4.1.8)
        activerecord (>= 3.0, < 8.0)
        delayed_job (>= 3.0, < 5)
      docile (1.4.0)
      doorkeeper (5.6.6)
        railties (>= 5)
 -    doorkeeper-i18n (5.2.6)
 +    doorkeeper-i18n (5.2.7)
        doorkeeper (>= 5.2)
 +    doorkeeper-openid_connect (1.8.7)
 +      doorkeeper (>= 5.5, < 5.7)
 +      jwt (>= 2.5)
 +    drb (2.1.1)
 +      ruby2_keywords
      dry-configurable (1.1.0)
        dry-core (~> 1.0, < 2)
        zeitwerk (~> 2.6)
@@@ -243,7 -231,7 +243,7 @@@
        faraday-net_http (>= 2.0, < 3.1)
        ruby2_keywords (>= 0.0.4)
      faraday-net_http (3.0.2)
 -    ffi (1.16.2)
 +    ffi (1.16.3)
      ffi-compiler (1.0.1)
        ffi (>= 1.0.0)
        rake
@@@ -256,7 -244,7 +256,7 @@@
        ffi (>= 1.0.0)
      globalid (1.2.1)
        activesupport (>= 6.1)
 -    google-protobuf (3.24.3)
 +    google-protobuf (3.24.4)
      hashdiff (1.0.1)
      hashie (5.0.0)
      highline (2.1.0)
@@@ -266,14 -254,14 +266,14 @@@
        concurrent-ruby (~> 1.0)
      i18n-js (3.9.2)
        i18n (>= 0.6.6)
 -    i18n-tasks (1.0.12)
 +    i18n-tasks (1.0.13)
        activesupport (>= 4.0.2)
        ast (>= 2.1.0)
        better_html (>= 1.0, < 3.0)
        erubi
        highline (>= 2.0.0)
        i18n
 -      parser (>= 2.2.3.0)
 +      parser (>= 3.2.2.1)
        rails-i18n
        rainbow (>= 2.2.2, < 4.0)
        terminal-table (>= 1.5.1)
@@@ -292,10 -280,6 +292,10 @@@
        ruby-vips (>= 2.0.17, < 3)
      image_size (3.3.0)
      in_threads (1.6.0)
 +    io-console (0.6.0)
 +    irb (1.8.3)
 +      rdoc
 +      reline (>= 0.3.8)
      jbuilder (2.11.5)
        actionview (>= 5.0.0)
        activesupport (>= 5.0.0)
@@@ -317,7 -301,7 +317,7 @@@
      logstasher (2.1.5)
        activesupport (>= 5.2)
        request_store
 -    loofah (2.21.3)
 +    loofah (2.21.4)
        crass (~> 1.0.2)
        nokogiri (>= 1.12.0)
      mail (2.8.1)
@@@ -328,15 -312,15 +328,15 @@@
      marcel (1.0.2)
      matrix (0.4.2)
      maxminddb (0.1.22)
 -    method_source (1.0.0)
      mini_magick (4.12.0)
      mini_mime (1.1.5)
 -    mini_portile2 (2.8.4)
 +    mini_portile2 (2.8.5)
      minitest (5.20.0)
      msgpack (1.7.2)
      multi_json (1.15.0)
      multi_xml (0.6.0)
 -    net-imap (0.3.7)
 +    mutex_m (0.1.2)
 +    net-imap (0.4.2)
        date
        net-protocol
      net-pop (0.1.2)
@@@ -396,14 -380,12 +396,14 @@@
        omniauth (~> 2.0)
      openstreetmap-deadlock_retry (1.3.1)
      parallel (1.23.0)
 -    parser (3.2.2.3)
 +    parser (3.2.2.4)
        ast (~> 2.4.1)
        racc
      pg (1.5.4)
      popper_js (2.11.8)
      progress (3.6.0)
 +    psych (5.1.1.1)
 +      stringio
      public_suffix (5.0.3)
      puma (5.6.7)
        nio4r (~> 2.0)
@@@ -418,28 -400,23 +418,28 @@@
        ruby-openid (>= 2.1.8)
      rack-protection (3.1.0)
        rack (~> 2.2, >= 2.2.4)
 +    rack-session (1.0.1)
 +      rack (< 3)
      rack-test (2.1.0)
        rack (>= 1.3)
      rack-uri_sanitizer (0.0.2)
 -    rails (7.0.8)
 -      actioncable (= 7.0.8)
 -      actionmailbox (= 7.0.8)
 -      actionmailer (= 7.0.8)
 -      actionpack (= 7.0.8)
 -      actiontext (= 7.0.8)
 -      actionview (= 7.0.8)
 -      activejob (= 7.0.8)
 -      activemodel (= 7.0.8)
 -      activerecord (= 7.0.8)
 -      activestorage (= 7.0.8)
 -      activesupport (= 7.0.8)
 +    rackup (1.0.0)
 +      rack (< 3)
 +      webrick
 +    rails (7.1.1)
 +      actioncable (= 7.1.1)
 +      actionmailbox (= 7.1.1)
 +      actionmailer (= 7.1.1)
 +      actionpack (= 7.1.1)
 +      actiontext (= 7.1.1)
 +      actionview (= 7.1.1)
 +      activejob (= 7.1.1)
 +      activemodel (= 7.1.1)
 +      activerecord (= 7.1.1)
 +      activestorage (= 7.1.1)
 +      activesupport (= 7.1.1)
        bundler (>= 1.15.0)
 -      railties (= 7.0.8)
 +      railties (= 7.1.1)
      rails-controller-testing (1.0.5)
        actionpack (>= 5.0.1.rc1)
        actionview (>= 5.0.1.rc1)
@@@ -454,36 -431,31 +454,36 @@@
      rails-i18n (7.0.8)
        i18n (>= 0.7, < 2)
        railties (>= 6.0.0, < 8)
 -    railties (7.0.8)
 -      actionpack (= 7.0.8)
 -      activesupport (= 7.0.8)
 -      method_source
 +    railties (7.1.1)
 +      actionpack (= 7.1.1)
 +      activesupport (= 7.1.1)
 +      irb
 +      rackup (>= 1.0.0)
        rake (>= 12.2)
 -      thor (~> 1.0)
 -      zeitwerk (~> 2.5)
 +      thor (~> 1.0, >= 1.2.2)
 +      zeitwerk (~> 2.6)
      rainbow (3.1.1)
      rake (13.0.6)
      rb-fsevent (0.11.2)
      rb-inotify (0.10.1)
        ffi (~> 1.0)
 -    regexp_parser (2.8.1)
 +    rdoc (6.5.0)
 +      psych (>= 4.0.0)
 +    regexp_parser (2.8.2)
 +    reline (0.3.9)
 +      io-console (~> 0.5)
      request_store (1.5.1)
        rack (>= 1.4)
      rexml (3.2.6)
      rinku (2.0.6)
      rotp (6.3.0)
      rouge (4.1.3)
 -    rubocop (1.56.3)
 +    rubocop (1.57.1)
        base64 (~> 0.1.1)
        json (~> 2.3)
        language_server-protocol (>= 3.17.0)
        parallel (~> 1.10)
 -      parser (>= 3.2.2.3)
 +      parser (>= 3.2.2.4)
        rainbow (>= 2.2.2, < 4.0)
        regexp_parser (>= 1.8, < 3.0)
        rexml (>= 3.2.5, < 4.0)
@@@ -496,12 -468,12 +496,12 @@@
        rubocop (~> 1.41)
      rubocop-factory_bot (2.24.0)
        rubocop (~> 1.33)
 -    rubocop-minitest (0.32.1)
 +    rubocop-minitest (0.33.0)
        rubocop (>= 1.39, < 2.0)
      rubocop-performance (1.19.1)
        rubocop (>= 1.7.0, < 2.0)
        rubocop-ast (>= 0.4.0)
 -    rubocop-rails (2.21.1)
 +    rubocop-rails (2.21.2)
        activesupport (>= 4.2.0)
        rack (>= 1.1)
        rubocop (>= 1.33.0, < 2.0)
@@@ -509,7 -481,7 +509,7 @@@
        rubocop (~> 1.0)
      ruby-openid (2.9.2)
      ruby-progressbar (1.13.0)
 -    ruby-vips (2.1.4)
 +    ruby-vips (2.2.0)
        ffi (~> 1.12)
      ruby2_keywords (0.0.5)
      rubyzip (2.3.2)
@@@ -520,7 -492,7 +520,7 @@@
        google-protobuf (~> 3.23)
        rake (>= 13.0.0)
      secure_headers (6.5.0)
 -    selenium-webdriver (4.13.1)
 +    selenium-webdriver (4.14.0)
        rexml (~> 3.2, >= 3.2.5)
        rubyzip (>= 1.2.2, < 3.0)
        websocket (~> 1.0)
@@@ -545,19 -517,18 +545,19 @@@
        actionpack (>= 5.2)
        activesupport (>= 5.2)
        sprockets (>= 3.0.0)
 -    strong_migrations (1.6.3)
 +    stringio (3.0.8)
 +    strong_migrations (1.6.4)
        activerecord (>= 5.2)
      terminal-table (3.0.2)
        unicode-display_width (>= 1.1.1, < 3)
 -    terser (1.1.18)
 +    terser (1.1.19)
        execjs (>= 0.3.0, < 3)
 -    thor (1.2.2)
 +    thor (1.3.0)
      tilt (2.3.0)
      timeout (0.4.0)
      tzinfo (2.0.6)
        concurrent-ruby (~> 1.0)
 -    unicode-display_width (2.4.2)
 +    unicode-display_width (2.5.0)
      validates_email_format_of (1.7.2)
        i18n
      vendorer (0.2.0)
@@@ -566,7 -537,6 +566,7 @@@
        addressable (>= 2.8.0)
        crack (>= 0.3.2)
        hashdiff (>= 0.4.0, < 2.0.0)
 +    webrick (1.8.1)
      websocket (1.2.10)
      websocket-driver (0.7.6)
        websocket-extensions (>= 0.1.0)
@@@ -598,6 -568,7 +598,6 @@@ DEPENDENCIE
    cancancan
    canonical-rails
    capybara (>= 2.15)
 -  composite_primary_keys (~> 14.0.0)
    config
    connection_pool
    dalli
@@@ -606,7 -577,6 +606,7 @@@
    delayed_job_active_record
    doorkeeper
    doorkeeper-i18n
 +  doorkeeper-openid_connect
    erb_lint
    factory_bot_rails
    faraday
@@@ -622,7 -592,6 +622,7 @@@
    jbuilder (~> 2.7)
    jquery-rails
    json
 +  jwt
    kgio
    kramdown
    libxml-ruby (>= 2.0.5)
@@@ -647,7 -616,7 +647,7 @@@
    r2 (~> 0.2.7)
    rack-cors
    rack-uri_sanitizer
 -  rails (~> 7.0.0)
 +  rails (~> 7.1.0)
    rails-controller-testing
    rails-i18n (~> 7.0.0)
    rinku (>= 2.0.6)