From: Tom Hughes <tom@compton.nu>
Date: Tue, 14 May 2024 17:47:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4791'
X-Git-Tag: live~569
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ea8fe8d5c3c55762a81ce0dc03ebd7c871982382?hp=822466c6c6737fef2fe8124e4cdd98126d42f76d

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ddd959664..f19b2e267 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,5 @@
 * https://www.ruby-lang.org/ - The homepage of Ruby which has more links and some great tutorials.
-* http://rubyonrails.org/ - The homepage of Rails, also has links and tutorials
+* https://rubyonrails.org/ - The homepage of Rails, also has links and tutorials.
 
 ## Coding style
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 62a312dca..29ed248e9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,16 +95,16 @@ GEM
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.925.0)
-    aws-sdk-core (3.194.1)
+    aws-partitions (1.928.0)
+    aws-sdk-core (3.196.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.80.0)
+    aws-sdk-kms (1.81.0)
       aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.149.1)
+    aws-sdk-s3 (1.150.0)
       aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
@@ -262,10 +262,9 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
-    i18n-tasks (1.0.13)
+    i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
-      better_html (>= 1.0, < 3.0)
       erubi
       highline (>= 2.0.0)
       i18n
@@ -336,11 +335,12 @@ GEM
       minitest (>= 4, < 6)
     msgpack (1.7.2)
     multi_json (1.15.0)
-    multi_xml (0.6.0)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    net-imap (0.4.10)
+    net-imap (0.4.11)
       date
       net-protocol
     net-pop (0.1.2)
@@ -349,8 +349,8 @@ GEM
       timeout
     net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.2)
-    nokogiri (1.16.4)
+    nio4r (2.7.3)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth (0.4.7)
@@ -396,7 +396,7 @@ GEM
     omniauth-openid (2.0.1)
       omniauth (>= 1.0, < 3.0)
       rack-openid (~> 1.4.0)
-    omniauth-rails_csrf_protection (1.0.1)
+    omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     openstreetmap-deadlock_retry (1.3.1)
@@ -474,8 +474,8 @@ GEM
       ffi (~> 1.0)
     rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    regexp_parser (2.9.0)
-    reline (0.5.5)
+    regexp_parser (2.9.1)
+    reline (0.5.7)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
@@ -485,7 +485,7 @@ GEM
     rouge (4.2.1)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
-    rubocop (1.63.4)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -592,7 +592,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.14)
 
 PLATFORMS
   ruby
diff --git a/INSTALL.md b/INSTALL.md
index 63aad6f1a..c8e28a62f 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -125,7 +125,7 @@ If you want to add in the full history later on, perhaps to run `git blame` or `
 
 ## Ruby gems
 
-We use [Bundler](http://gembundler.com/) to manage the rubygems required for the project.
+We use [Bundler](https://bundler.io/) to manage the rubygems required for the project.
 
 ```
 cd openstreetmap-website
diff --git a/README.md b/README.md
index b7d2a4f02..eba23a360 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![Tests](https://github.com/openstreetmap/openstreetmap-website/workflows/Tests/badge.svg?branch=master&event=push)](https://github.com/openstreetmap/openstreetmap-website/actions?query=workflow%3ATests%20branch%3Amaster%20event%3Apush)
 [![Coverage Status](https://coveralls.io/repos/openstreetmap/openstreetmap-website/badge.svg?branch=master)](https://coveralls.io/r/openstreetmap/openstreetmap-website?branch=master)
 
-This is `openstreetmap-website`, the [Ruby on Rails](http://rubyonrails.org/)
+This is `openstreetmap-website`, the [Ruby on Rails](https://rubyonrails.org/)
 application that powers the [OpenStreetMap](https://www.openstreetmap.org) website and API.
 
 This repository consists of:
diff --git a/config/locales/README b/config/locales/README
index 136afb014..ac2146830 100644
--- a/config/locales/README
+++ b/config/locales/README
@@ -10,4 +10,4 @@ errors, as there is at least one test that makes sure that all translations are
 valid (we'll makes sure that they won't cause the site to not work).
 
 There is more information about translating the website on the wiki at
-http://wiki.openstreetmap.org/wiki/Website_Internationalization.
+https://wiki.openstreetmap.org/wiki/Website_internationalization.