Sync with upstream (2026-10-20)

.github/workflows/danger.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup ruby
-        uses: ruby/setup-ruby@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.0
+        uses: ruby/setup-ruby@e81a8fa391b11a595c1b7ed84177cc0fe02faf83 # v1.328.0
         with:
           ruby-version: 3.3
           bundler-cache: true

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Check out code
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
     - name: Setup ruby
-      uses: ruby/setup-ruby@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.0
+      uses: ruby/setup-ruby@e81a8fa391b11a595c1b7ed84177cc0fe02faf83 # v1.328.0
       with:
         ruby-version: ${{ env.ruby }}
         bundler-cache: true
@@ -33,7 +33,7 @@ jobs:
     - name: Check out code
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
     - name: Setup ruby
-      uses: ruby/setup-ruby@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.0
+      uses: ruby/setup-ruby@e81a8fa391b11a595c1b7ed84177cc0fe02faf83 # v1.328.0
       with:
         ruby-version: ${{ env.ruby }}
         bundler-cache: true
@@ -47,14 +47,14 @@ jobs:
     - name: Check out code
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
     - name: Setup ruby
-      uses: ruby/setup-ruby@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.0
+      uses: ruby/setup-ruby@e81a8fa391b11a595c1b7ed84177cc0fe02faf83 # v1.328.0
       with:
         ruby-version: ${{ env.ruby }}
         bundler-cache: true
     - name: Run herb parser
       run: bundle exec herb analyze app/
     - name: Cache node modules
-      uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+      uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
       with:
         cache: yarn
     - name: Install node modules
@@ -71,12 +71,12 @@ jobs:
     - name: Check out code
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
     - name: Setup ruby
-      uses: ruby/setup-ruby@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.0
+      uses: ruby/setup-ruby@e81a8fa391b11a595c1b7ed84177cc0fe02faf83 # v1.328.0
       with:
         ruby-version: ${{ env.ruby }}
         bundler-cache: true
     - name: Cache node modules
-      uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+      uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
       with:
         cache: yarn
     - name: Install node modules
@@ -97,7 +97,7 @@ jobs:
     - name: Check out code
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
     - name: Setup ruby
-      uses: ruby/setup-ruby@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.0
+      uses: ruby/setup-ruby@e81a8fa391b11a595c1b7ed84177cc0fe02faf83 # v1.328.0
       with:
         ruby-version: ${{ env.ruby }}
         bundler-cache: true
@@ -113,7 +113,7 @@ jobs:
     - name: Check out code
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
     - name: Setup ruby
-      uses: ruby/setup-ruby@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.0
+      uses: ruby/setup-ruby@e81a8fa391b11a595c1b7ed84177cc0fe02faf83 # v1.328.0
       with:
         ruby-version: ${{ env.ruby }}
         bundler-cache: true
@@ -122,7 +122,7 @@ jobs:
         cp config/github.database.yml config/database.yml
         cp config/example.storage.yml config/storage.yml
     - name: Cache node modules
-      uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+      uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
       with:
         cache: yarn
     - name: Install node modules
@@ -151,7 +151,7 @@ jobs:
     - name: Check out code
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
     - name: Setup ruby
-      uses: ruby/setup-ruby@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.0
+      uses: ruby/setup-ruby@e81a8fa391b11a595c1b7ed84177cc0fe02faf83 # v1.328.0
       with:
         ruby-version: ${{ env.ruby }}
         bundler-cache: true
@@ -160,7 +160,7 @@ jobs:
         cp config/github.database.yml config/database.yml
         cp config/example.storage.yml config/storage.yml
     - name: Cache node modules
-      uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+      uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
       with:
         cache: yarn
     - name: Install node modules

.github/workflows/tests.yml

@@ -25,13 +25,13 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
     - name: Setup ruby
-      uses: ruby/setup-ruby@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.0
+      uses: ruby/setup-ruby@e81a8fa391b11a595c1b7ed84177cc0fe02faf83 # v1.328.0
       with:
         ruby-version: ${{ matrix.ruby }}
         rubygems: 3.4.10
         bundler-cache: true
     - name: Cache node modules
-      uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+      uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
       with:
         cache: yarn
     - name: Install packages
@@ -76,7 +76,7 @@ jobs:
       env:
         DISPLAY: ":99"
     - name: Upload screenshots
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
       if: failure()
       with:
         name: screenshots

.rubocop_todo.yml

@@ -57,7 +57,7 @@ Metrics/BlockNesting:
 # Offense count: 23
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 352
+  Max: 353
 
 # Offense count: 72
 # Configuration parameters: AllowedMethods, AllowedPatterns.

CONTRIBUTING.md

@@ -64,7 +64,7 @@ you do communicate, early and often, so that you can get feedback quickly.
 This will help you get buy-in from the maintainers, which will translate into
 less waste for everyone and a much easier time getting your code merged.
 
-Bug fixes should be more straighforward than new features, but the same
+Bug fixes should be more straightforward than new features, but the same
 guidance applies. If it turns out to be more complex than initially expected,
 stop for a moment and seek feedback, be it in an issue or in a draft PR.
 

FAQ.md

@@ -7,8 +7,8 @@ promote a large OpenStreetMap focused conference or host a worldwide donation
 drive.  This is a great way to reach a lot of people!
 
 1. Please review the Operations Working Group's [Banner Policy](https://operations.osmfoundation.org/policies/banner/) to know whether your event qualifies for a front-page banner.
-2. Create the banner image.  The image needs to:
-   * be exactly 350px wide and at most 350px tall,
+2. Create the banner image in two sizes for 1× and 2× resolution.  The images need to:
+   * be exactly 350px wide and at most 350px tall, or double that for 2×,
    * be in PNG format,
    * have nothing important in the top-right 60x60px corner of the banner which has a close 'X' button overlayed, and
    * have sufficient visual contrast with the colours #cccccc and #999999 so the 'X' can be seen.

Gemfile

@@ -12,10 +12,8 @@ gem "pg"
 
 # Use SCSS for stylesheets
 gem "dartsass-sprockets"
-# Pin the dependent sass-embedded to avoid deprecation warnings in bootstrap
-gem "sass-embedded", "~> 1.64.0"
-# Pin uri to avoid errors in dartsass-ruby
-gem "uri", "< 1.0.0"
+# Don't allow upgrade to 3.0.0 as some deprecations will become errors
+gem "sass-embedded", "< 3.0.0"
 
 # Use Terser as compressor for JavaScript assets
 gem "terser"
@@ -53,6 +51,7 @@ gem "benchmark"
 gem "actionpack-page_caching"
 gem "activerecord-import"
 gem "active_record_union"
+gem "active_storage_validations"
 gem "bootstrap"
 gem "bootstrap_form"
 gem "cancancan"