From: Tom Hughes <tom@compton.nu>
Date: Sat, 19 Aug 2023 10:30:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4187'
X-Git-Tag: live~1906
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/406d90c5c8da5633324bb1d28d7a2103a61c95e4?hp=3f6e344e6ad6f8e75cd0be3d02492cfc322893e8

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

diff --git a/FAQ.md b/FAQ.md
index 4ed5df7c4..d4ac1fc9f 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -15,7 +15,7 @@ drive.  This is a great way to reach a lot of people!
    * Edit [`config/banners.yml`](https://github.com/openstreetmap/openstreetmap-website/blob/master/config/banners.yml) to contain an entry for the event banner.  It should contain the following:
      * `id` - a unique identifier (e.g. `donate2017`)
      * `alt` - alt name for the image (e.g. `OpenStreetMap Funding Drive 2017`)
-     * `link` - URL for your event page (e.g. `https://donate.openstreetmap.org/`)
+     * `link` - URL for your event page (e.g. `https://supporting.openstreetmap.org/`)
      * `img` - the filename for the banner image (e.g. `banners/donate-2017.jpg`)
      * `enddate` - the final date that the banner will be shown (e.g. `2017-oct-31`)
    * (optional) Feel free to cleanup the old images from the `app/assets/images/banners/` folder and old entries in the `config/banners.yml` file.
diff --git a/Gemfile.lock b/Gemfile.lock
index b75e93606..847350b7a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -372,7 +372,7 @@ GEM
     popper_js (2.11.8)
     progress (3.6.0)
     public_suffix (5.0.3)
-    puma (5.6.6)
+    puma (5.6.7)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.8)
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 88d16bc8e..6e61100f2 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -22,7 +22,7 @@ L.OSM.Map = L.Map.extend({
     var copyright = I18n.t("javascripts.map.copyright_text", { copyright_link: copyright_link });
 
     var donate = $("<a>", {
-      "href": "https://donate.openstreetmap.org",
+      "href": "https://supporting.openstreetmap.org",
       "class": "donate-attr",
       "text": I18n.t("javascripts.map.make_a_donation")
     }).prop("outerHTML");