]> git.openstreetmap.org Git - rails.git/log
rails.git
3 days agoDisable dark mode filtering by default
Marwin Hochfelsner [Thu, 16 Jan 2025 20:16:21 +0000 (21:16 +0100)]
Disable dark mode filtering by default

3 days agoAllow map layers to specify an alternate tile set for dark mode
Marwin Hochfelsner [Thu, 16 Jan 2025 20:16:14 +0000 (21:16 +0100)]
Allow map layers to specify an alternate tile set for dark mode

3 days agoMerge remote-tracking branch 'upstream/pull/5513'
Tom Hughes [Sat, 18 Jan 2025 11:45:38 +0000 (11:45 +0000)]
Merge remote-tracking branch 'upstream/pull/5513'

3 days agoMerge remote-tracking branch 'upstream/pull/5510'
Tom Hughes [Sat, 18 Jan 2025 11:41:08 +0000 (11:41 +0000)]
Merge remote-tracking branch 'upstream/pull/5510'

4 days agoRemove "Public editing" line from settings page
Anton Khorev [Sat, 18 Jan 2025 00:32:57 +0000 (03:32 +0300)]
Remove "Public editing" line from settings page

4 days agoMerge pull request #5437 from AntonKhorev/user-status-resource
Andy Allan [Fri, 17 Jan 2025 17:55:02 +0000 (17:55 +0000)]
Merge pull request #5437 from AntonKhorev/user-status-resource

Use resourceful route for user status

4 days agoMerge pull request #5508 from AntonKhorev/fix-dashboard-follow
Andy Allan [Fri, 17 Jan 2025 17:53:51 +0000 (17:53 +0000)]
Merge pull request #5508 from AntonKhorev/fix-dashboard-follow

Fix missing translation of Follow links on dashboard

4 days agoMerge pull request #5509 from AntonKhorev/restore-follows-form
Andy Allan [Fri, 17 Jan 2025 17:53:00 +0000 (17:53 +0000)]
Merge pull request #5509 from AntonKhorev/restore-follows-form

Use form with normal-sized button on follows show pages

4 days agoAdds validating of notes foreign key
Nenad Vujicic [Mon, 13 Jan 2025 12:09:04 +0000 (13:09 +0100)]
Adds validating of notes foreign key

Adds migration for validation foreign key in notes table referencing users table.

4 days agoUse form with normal-sized button on follows show pages
Anton Khorev [Fri, 17 Jan 2025 02:28:59 +0000 (05:28 +0300)]
Use form with normal-sized button on follows show pages

4 days agoFix missing translation of Follow links on dashboard
Anton Khorev [Fri, 17 Jan 2025 02:09:05 +0000 (05:09 +0300)]
Fix missing translation of Follow links on dashboard

4 days agoMerge branch 'pull/5261'
Anton Khorev [Fri, 17 Jan 2025 01:01:22 +0000 (04:01 +0300)]
Merge branch 'pull/5261'

5 days agoMerge remote-tracking branch 'upstream/pull/5500'
Tom Hughes [Thu, 16 Jan 2025 19:03:43 +0000 (19:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5500'

5 days agoMerge remote-tracking branch 'upstream/pull/5499'
Tom Hughes [Thu, 16 Jan 2025 18:38:36 +0000 (18:38 +0000)]
Merge remote-tracking branch 'upstream/pull/5499'

5 days agoMerge remote-tracking branch 'upstream/pull/5494'
Tom Hughes [Thu, 16 Jan 2025 18:35:36 +0000 (18:35 +0000)]
Merge remote-tracking branch 'upstream/pull/5494'

5 days agoMerge remote-tracking branch 'upstream/pull/5506'
Tom Hughes [Thu, 16 Jan 2025 18:18:06 +0000 (18:18 +0000)]
Merge remote-tracking branch 'upstream/pull/5506'

5 days agoMerge remote-tracking branch 'upstream/pull/5502'
Tom Hughes [Thu, 16 Jan 2025 18:03:08 +0000 (18:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5502'

5 days agoRemove account terms code unreachable for unregistered users
Anton Khorev [Thu, 16 Jan 2025 15:54:55 +0000 (18:54 +0300)]
Remove account terms code unreachable for unregistered users

5 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 16 Jan 2025 12:13:45 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

5 days agoMerge branch 'pull/5503'
Anton Khorev [Thu, 16 Jan 2025 00:54:43 +0000 (03:54 +0300)]
Merge branch 'pull/5503'

6 days agoBump osm-community-index from 5.9.0 to 5.9.1
dependabot[bot] [Wed, 15 Jan 2025 23:45:56 +0000 (23:45 +0000)]
Bump osm-community-index from 5.9.0 to 5.9.1

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.9.0 to 5.9.1.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.9.0...v5.9.1)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
6 days agoUse resourceful route for user status
Anton Khorev [Mon, 23 Dec 2024 02:55:14 +0000 (05:55 +0300)]
Use resourceful route for user status

6 days agoRemoved unused translations in preferences.show
Nenad Vujicic [Wed, 15 Jan 2025 16:45:22 +0000 (17:45 +0100)]
Removed unused translations in preferences.show

After merging 967e6d4 preferences.show.{preferred_editor, preferred_languages} are not used anymore.

6 days agoMerge pull request #5433 from AntonKhorev/user-routes-api-namespace
Andy Allan [Wed, 15 Jan 2025 12:55:41 +0000 (12:55 +0000)]
Merge pull request #5433 from AntonKhorev/user-routes-api-namespace

Resourceful routes for users api

6 days agoMerge pull request #5449 from AntonKhorev/edit-preferences
Andy Allan [Wed, 15 Jan 2025 12:49:34 +0000 (12:49 +0000)]
Merge pull request #5449 from AntonKhorev/edit-preferences

Make preferences page editable without clicking 'Edit Preferences'

6 days agoMerge pull request #5501 from openstreetmap/dependabot/npm_and_yarn/qs-6.14.0
Andy Allan [Wed, 15 Jan 2025 11:45:08 +0000 (11:45 +0000)]
Merge pull request #5501 from openstreetmap/dependabot/npm_and_yarn/qs-6.14.0

Bump qs from 6.13.1 to 6.14.0

6 days agoAdded unit tests for new Note methods
Nenad Vujicic [Mon, 13 Jan 2025 10:28:11 +0000 (11:28 +0100)]
Added unit tests for new Note methods

Added unit tests for new Note methods and updated system tests to use description instead of first comment's body.

6 days agoChanged note's first comment body to description
Nenad Vujicic [Tue, 14 Jan 2025 12:32:22 +0000 (13:32 +0100)]
Changed note's first comment body to description

Replaced using note's first comment body with note's description.

7 days agoBump qs from 6.13.1 to 6.14.0
dependabot[bot] [Tue, 14 Jan 2025 23:14:53 +0000 (23:14 +0000)]
Bump qs from 6.13.1 to 6.14.0

Bumps [qs](https://github.com/ljharb/qs) from 6.13.1 to 6.14.0.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.13.1...v6.14.0)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
7 days agoInstall add/remove event listeners directly on note layer
Anton Khorev [Tue, 14 Jan 2025 23:02:47 +0000 (02:02 +0300)]
Install add/remove event listeners directly on note layer

7 days agoMerge remote-tracking branch 'upstream/pull/5495'
Tom Hughes [Tue, 14 Jan 2025 19:05:09 +0000 (19:05 +0000)]
Merge remote-tracking branch 'upstream/pull/5495'

7 days agoMerge remote-tracking branch 'upstream/pull/5498'
Tom Hughes [Tue, 14 Jan 2025 18:45:19 +0000 (18:45 +0000)]
Merge remote-tracking branch 'upstream/pull/5498'

7 days agoFix new rubocop warnings
Tom Hughes [Tue, 14 Jan 2025 18:31:52 +0000 (18:31 +0000)]
Fix new rubocop warnings

7 days agoUpdate bundle
Tom Hughes [Tue, 14 Jan 2025 18:08:36 +0000 (18:08 +0000)]
Update bundle

7 days agoAdded description and author_id methods to Note
Nenad Vujicic [Mon, 13 Jan 2025 09:21:56 +0000 (10:21 +0100)]
Added description and author_id methods to Note

Added description and author_id (author_ip already exists) methods to Note model. They still use first comment (but will be soon replaced to use records from Note model).

7 days agoRemove references to OAuth 1 client_application model
Anton Khorev [Tue, 14 Jan 2025 11:55:25 +0000 (14:55 +0300)]
Remove references to OAuth 1 client_application model

7 days agoRefactor friendships controller and model
nertc [Tue, 14 Jan 2025 07:33:56 +0000 (11:33 +0400)]
Refactor friendships controller and model

7 days agoModify the way Friends are added
nertc [Tue, 14 Jan 2025 07:32:54 +0000 (11:32 +0400)]
Modify the way Friends are added

8 days agoTest that encouragement disappears after verified email signup
Anton Khorev [Mon, 13 Jan 2025 11:11:11 +0000 (14:11 +0300)]
Test that encouragement disappears after verified email signup

8 days agoTest that anonymous note encouragement disappears after signup
Anton Khorev [Mon, 13 Jan 2025 10:52:44 +0000 (13:52 +0300)]
Test that anonymous note encouragement disappears after signup

8 days agoTest that anonymous note encouragement disappears after login
Anton Khorev [Mon, 13 Jan 2025 10:30:57 +0000 (13:30 +0300)]
Test that anonymous note encouragement disappears after login

8 days agoTest that encouragement appears after 10 anonymous notes
Anton Khorev [Mon, 13 Jan 2025 10:27:15 +0000 (13:27 +0300)]
Test that encouragement appears after 10 anonymous notes

8 days agoMerge branch 'anonymous-notes-counter'
Anton Khorev [Mon, 13 Jan 2025 11:50:26 +0000 (14:50 +0300)]
Merge branch 'anonymous-notes-counter'

8 days agodisplay an encouragement to contribute after many anonymous notes
Etilène Jourdier [Sun, 12 Jan 2025 21:42:57 +0000 (22:42 +0100)]
display an encouragement to contribute after many anonymous notes

create a counter of anonymous notes in a cookie, read by new note controller to display an encouragement to contribute in the already existing anonymous warning if the anonymous visitor has already created at least 10 anonymous notes. Cookie deleted on log-in and sign-up after email validation

8 days agoAdded description, user_id, user_ip columns to notes
Nenad Vujicic [Mon, 13 Jan 2025 09:52:38 +0000 (10:52 +0100)]
Added description, user_id, user_ip columns to notes

Added migration for adding new columns (description, user_id, user_ip) to notes table. Also, migration adds foreign key connecting notes and users tables (using user_id column).

9 days agoMerge remote-tracking branch 'upstream/pull/5492'
Tom Hughes [Sun, 12 Jan 2025 16:02:07 +0000 (16:02 +0000)]
Merge remote-tracking branch 'upstream/pull/5492'

9 days agoMerge remote-tracking branch 'upstream/pull/5491'
Tom Hughes [Sun, 12 Jan 2025 16:00:09 +0000 (16:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5491'

10 days agoRename gpx description template to details
Anton Khorev [Sat, 11 Jan 2025 12:57:17 +0000 (15:57 +0300)]
Rename gpx description template to details

"Description" is just one of trace properties, details include description and other things.

10 days agoMove number of points to file details in gpx emails
Anton Khorev [Sat, 11 Jan 2025 12:53:36 +0000 (15:53 +0300)]
Move number of points to file details in gpx emails

11 days agoBump eslint from 9.17.0 to 9.18.0
dependabot[bot] [Fri, 10 Jan 2025 23:43:33 +0000 (23:43 +0000)]
Bump eslint from 9.17.0 to 9.18.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.17.0 to 9.18.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.17.0...v9.18.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
12 days agoMerge remote-tracking branch 'upstream/pull/5487'
Tom Hughes [Thu, 9 Jan 2025 18:08:31 +0000 (18:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5487'

12 days agoMerge branch 'pull/5484'
Anton Khorev [Thu, 9 Jan 2025 14:20:25 +0000 (17:20 +0300)]
Merge branch 'pull/5484'

12 days agoShow diary entry after creation
Andy Allan [Wed, 8 Jan 2025 11:27:54 +0000 (11:27 +0000)]
Show diary entry after creation

This allows users to review their post and use the social share
buttons more easily.

Refs #1391

12 days agoMove trace descriptions out of success/failure sentences in emails
Anton Khorev [Thu, 9 Jan 2025 10:58:38 +0000 (13:58 +0300)]
Move trace descriptions out of success/failure sentences in emails

13 days agoMerge remote-tracking branch 'upstream/pull/5486'
Tom Hughes [Wed, 8 Jan 2025 20:19:16 +0000 (20:19 +0000)]
Merge remote-tracking branch 'upstream/pull/5486'

13 days agoMerge pull request #5462 from AntonKhorev/user-terms-resource
Andy Allan [Wed, 8 Jan 2025 19:31:17 +0000 (19:31 +0000)]
Merge pull request #5462 from AntonKhorev/user-terms-resource

Use resourceful routes for terms view/accept/decline

13 days agoUse resourceful routes for terms view/accept/decline
Anton Khorev [Sat, 4 Jan 2025 11:25:47 +0000 (14:25 +0300)]
Use resourceful routes for terms view/accept/decline

13 days agoUpdate documentation to avoid erb_lint deprecations
Andy Allan [Wed, 8 Jan 2025 19:15:22 +0000 (19:15 +0000)]
Update documentation to avoid erb_lint deprecations

I didn't spot this in #5357

13 days agoRemove slashes from body css classes
Anton Khorev [Sat, 4 Jan 2025 10:23:22 +0000 (13:23 +0300)]
Remove slashes from body css classes

13 days agoMerge remote-tracking branch 'upstream/pull/5483'
Tom Hughes [Wed, 8 Jan 2025 18:57:37 +0000 (18:57 +0000)]
Merge remote-tracking branch 'upstream/pull/5483'

13 days agoRestrict version of dry-schema for ruby 3.1.2 compatibility
Andy Allan [Wed, 8 Jan 2025 15:14:50 +0000 (15:14 +0000)]
Restrict version of dry-schema for ruby 3.1.2 compatibility

https://bugs.ruby-lang.org/issues/18673 affects some methods using
anonymous blocks, and was fixed in ruby 3.1.3. However, debian/bookworm
ruby 3.1 package is based on 3.1.2 and does not yet contain this fix.

Since bookworm is used in our Docker build, and also used in production
by OSMF, then we can restrict dry-schema to a version that does not
use anonymous blocks.

Fixes #5482

13 days agoMerge remote-tracking branch 'upstream/pull/5480'
Tom Hughes [Wed, 8 Jan 2025 18:29:14 +0000 (18:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5480'

2 weeks agoBump leaflet.locatecontrol from 0.83.0 to 0.83.1
dependabot[bot] [Tue, 7 Jan 2025 23:11:50 +0000 (23:11 +0000)]
Bump leaflet.locatecontrol from 0.83.0 to 0.83.1

Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.83.0 to 0.83.1.
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.83.0...v0.83.1)

---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks agoMerge remote-tracking branch 'upstream/pull/5459'
Tom Hughes [Tue, 7 Jan 2025 19:08:13 +0000 (19:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5459'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5479'
Tom Hughes [Tue, 7 Jan 2025 18:31:05 +0000 (18:31 +0000)]
Merge remote-tracking branch 'upstream/pull/5479'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5478'
Tom Hughes [Tue, 7 Jan 2025 18:28:04 +0000 (18:28 +0000)]
Merge remote-tracking branch 'upstream/pull/5478'

2 weeks agoUpdate bundle
Tom Hughes [Tue, 7 Jan 2025 18:22:09 +0000 (18:22 +0000)]
Update bundle

2 weeks agoMove browse/feature template to elements/show
Anton Khorev [Mon, 6 Jan 2025 15:58:55 +0000 (18:58 +0300)]
Move browse/feature template to elements/show

2 weeks agoAdd ElementsController base class
Anton Khorev [Mon, 6 Jan 2025 14:42:51 +0000 (17:42 +0300)]
Add ElementsController base class

2 weeks agoReport deactivates_at as block read date
Anton Khorev [Tue, 7 Jan 2025 10:19:33 +0000 (13:19 +0300)]
Report deactivates_at as block read date

2 weeks agoMerge remote-tracking branch 'upstream/pull/5477'
Tom Hughes [Tue, 7 Jan 2025 08:42:45 +0000 (08:42 +0000)]
Merge remote-tracking branch 'upstream/pull/5477'

2 weeks agoUpdate redefinition of interestingNode to match leaflet-osm
Tom Hughes [Tue, 7 Jan 2025 08:38:51 +0000 (08:38 +0000)]
Update redefinition of interestingNode to match leaflet-osm

2 weeks agoUpdate arguments of data overlay interestingNode()
Anton Khorev [Tue, 7 Jan 2025 08:26:15 +0000 (11:26 +0300)]
Update arguments of data overlay interestingNode()

2 weeks agoMerge remote-tracking branch 'upstream/pull/5476'
Tom Hughes [Mon, 6 Jan 2025 19:07:56 +0000 (19:07 +0000)]
Merge remote-tracking branch 'upstream/pull/5476'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5475'
Tom Hughes [Mon, 6 Jan 2025 19:06:32 +0000 (19:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5475'

2 weeks agoCheck deactivates_at to report if block was read after its end date
Anton Khorev [Mon, 6 Jan 2025 18:10:18 +0000 (21:10 +0300)]
Check deactivates_at to report if block was read after its end date

2 weeks agoMake browse not found pages consistent
Anton Khorev [Mon, 6 Jan 2025 17:15:08 +0000 (20:15 +0300)]
Make browse not found pages consistent

2 weeks agoUpdate leaflet-osm to latest upstream version
Tom Hughes [Sun, 5 Jan 2025 22:37:14 +0000 (22:37 +0000)]
Update leaflet-osm to latest upstream version

2 weeks agoMerge remote-tracking branch 'upstream/pull/5464'
Tom Hughes [Sun, 5 Jan 2025 16:38:12 +0000 (16:38 +0000)]
Merge remote-tracking branch 'upstream/pull/5464'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5471'
Tom Hughes [Sun, 5 Jan 2025 16:23:49 +0000 (16:23 +0000)]
Merge remote-tracking branch 'upstream/pull/5471'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5470'
Tom Hughes [Sun, 5 Jan 2025 16:17:20 +0000 (16:17 +0000)]
Merge remote-tracking branch 'upstream/pull/5470'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5469'
Tom Hughes [Sun, 5 Jan 2025 16:14:18 +0000 (16:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5469'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5465'
Tom Hughes [Sun, 5 Jan 2025 16:09:32 +0000 (16:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5465'

2 weeks agoUse details attribute to render changeset bounding box
Anton Khorev [Sun, 5 Jan 2025 14:59:47 +0000 (17:59 +0300)]
Use details attribute to render changeset bounding box

Do this instead of using L.OSM.DataLayer. DataLayer makes an extra request just to get the bbox. Also it expects bbox to always exist, which is not true for some changesets.

2 weeks agoWrite details attribute to changeset page
Anton Khorev [Sun, 5 Jan 2025 14:57:31 +0000 (17:57 +0300)]
Write details attribute to changeset page

2 weeks agoMove changeset data to a helper
Anton Khorev [Sun, 5 Jan 2025 14:35:37 +0000 (17:35 +0300)]
Move changeset data to a helper

2 weeks agoRemove 'center' argument of addChangeset()
Anton Khorev [Sun, 5 Jan 2025 14:28:36 +0000 (17:28 +0300)]
Remove 'center' argument of addChangeset()

It is always set to true.

2 weeks agoRemove zoomend listener on history unload
Anton Khorev [Sun, 5 Jan 2025 12:02:25 +0000 (15:02 +0300)]
Remove zoomend listener on history unload

2 weeks agoAllow thirdparty images on failed diary comment saves
Anton Khorev [Sun, 5 Jan 2025 06:55:48 +0000 (09:55 +0300)]
Allow thirdparty images on failed diary comment saves

2 weeks agoFix options passed by allow_thirdparty_images
Anton Khorev [Sat, 4 Jan 2025 15:47:51 +0000 (18:47 +0300)]
Fix options passed by allow_thirdparty_images

2 weeks agoShow outbox after sending new message
Anton Khorev [Sat, 4 Jan 2025 15:09:27 +0000 (18:09 +0300)]
Show outbox after sending new message

2 weeks agoMove redacted version locale strings to old_elements
Anton Khorev [Sat, 4 Jan 2025 14:41:29 +0000 (17:41 +0300)]
Move redacted version locale strings to old_elements

2 weeks agoMove history_title_html locale string to old_elements
Anton Khorev [Sat, 4 Jan 2025 14:35:05 +0000 (17:35 +0300)]
Move history_title_html locale string to old_elements

2 weeks agoMove browse history template to old elements directory
Anton Khorev [Sat, 4 Jan 2025 14:22:38 +0000 (17:22 +0300)]
Move browse history template to old elements directory

2 weeks agoMove element version actions template to old elements directory
Anton Khorev [Sat, 4 Jan 2025 14:11:48 +0000 (17:11 +0300)]
Move element version actions template to old elements directory

2 weeks agoAdd OldElementsController base class
Anton Khorev [Sat, 4 Jan 2025 14:00:43 +0000 (17:00 +0300)]
Add OldElementsController base class

2 weeks agoMerge remote-tracking branch 'upstream/pull/5461'
Tom Hughes [Fri, 3 Jan 2025 19:32:42 +0000 (19:32 +0000)]
Merge remote-tracking branch 'upstream/pull/5461'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5460'
Tom Hughes [Fri, 3 Jan 2025 19:29:28 +0000 (19:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5460'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5458'
Tom Hughes [Fri, 3 Jan 2025 19:21:29 +0000 (19:21 +0000)]
Merge remote-tracking branch 'upstream/pull/5458'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5454'
Tom Hughes [Fri, 3 Jan 2025 19:19:52 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/pull/5454'