]> git.openstreetmap.org Git - rails.git/log
rails.git
9 days agoAdd indexes on user+id to changeset and diary comments
Tom Hughes [Tue, 21 Jan 2025 19:21:17 +0000 (19:21 +0000)]
Add indexes on user+id to changeset and diary comments

9 days agoMerge remote-tracking branch 'upstream/pull/5518'
Tom Hughes [Tue, 21 Jan 2025 18:44:31 +0000 (18:44 +0000)]
Merge remote-tracking branch 'upstream/pull/5518'

9 days agoMerge remote-tracking branch 'upstream/pull/5528'
Tom Hughes [Tue, 21 Jan 2025 18:26:47 +0000 (18:26 +0000)]
Merge remote-tracking branch 'upstream/pull/5528'

9 days agoUpdate bundle
Tom Hughes [Tue, 21 Jan 2025 18:08:49 +0000 (18:08 +0000)]
Update bundle

10 days agoTest fallback locale on embed page
Anton Khorev [Mon, 20 Jan 2025 23:49:07 +0000 (02:49 +0300)]
Test fallback locale on embed page

10 days agoMerge branch 'pull/5527'
Anton Khorev [Mon, 20 Jan 2025 23:39:25 +0000 (02:39 +0300)]
Merge branch 'pull/5527'

10 days agoMerge pull request #5421 from tomhughes/ecma-version
Andy Allan [Mon, 20 Jan 2025 17:54:02 +0000 (17:54 +0000)]
Merge pull request #5421 from tomhughes/ecma-version

Bump allowed ECMAScript version to 2021 (ES12)

10 days agoEnable I18n fallback for the embed page
Tom Hughes [Mon, 20 Jan 2025 11:42:23 +0000 (11:42 +0000)]
Enable I18n fallback for the embed page

Fixes #5526.

11 days agoMerge remote-tracking branch 'upstream/pull/5520'
Tom Hughes [Sun, 19 Jan 2025 15:02:11 +0000 (15:02 +0000)]
Merge remote-tracking branch 'upstream/pull/5520'

11 days agoMerge remote-tracking branch 'upstream/pull/5517'
Tom Hughes [Sun, 19 Jan 2025 15:01:25 +0000 (15:01 +0000)]
Merge remote-tracking branch 'upstream/pull/5517'

11 days agoMerge remote-tracking branch 'upstream/pull/5516'
Tom Hughes [Sun, 19 Jan 2025 14:58:26 +0000 (14:58 +0000)]
Merge remote-tracking branch 'upstream/pull/5516'

11 days agoMerge remote-tracking branch 'upstream/pull/5515'
Tom Hughes [Sun, 19 Jan 2025 14:57:40 +0000 (14:57 +0000)]
Merge remote-tracking branch 'upstream/pull/5515'

12 days agoInclude message_read attribute in api output of messages to self
Anton Khorev [Sun, 19 Jan 2025 02:48:36 +0000 (05:48 +0300)]
Include message_read attribute in api output of messages to self

12 days agoCreate changeset_comments resources for users
Anton Khorev [Sun, 19 Jan 2025 01:11:06 +0000 (04:11 +0300)]
Create changeset_comments resources for users

12 days agoCreate user comments controller base class
Anton Khorev [Sun, 19 Jan 2025 00:30:18 +0000 (03:30 +0300)]
Create user comments controller base class

12 days agoAdd tabbed navigation to user's diary comments page
Anton Khorev [Sat, 18 Jan 2025 23:58:56 +0000 (02:58 +0300)]
Add tabbed navigation to user's diary comments page

12 days agoCreate diary_comments resources for users
Anton Khorev [Sat, 18 Jan 2025 23:40:13 +0000 (02:40 +0300)]
Create diary_comments resources for users

12 days agoChange user's diary comments path to match model name
Anton Khorev [Sat, 18 Jan 2025 23:05:49 +0000 (02:05 +0300)]
Change user's diary comments path to match model name

12 days agoRename diary_comments_path to user_diary_comments_path
Anton Khorev [Sat, 18 Jan 2025 22:54:07 +0000 (01:54 +0300)]
Rename diary_comments_path to user_diary_comments_path

12 days agoSimplify diary_comments_path calls in tests
Anton Khorev [Sat, 18 Jan 2025 22:48:34 +0000 (01:48 +0300)]
Simplify diary_comments_path calls in tests

12 days agoCreate traces feed resource
Anton Khorev [Sat, 18 Jan 2025 20:01:47 +0000 (23:01 +0300)]
Create traces feed resource

12 days agoAdd regexp constraints to trace ids
Anton Khorev [Sat, 18 Jan 2025 19:37:37 +0000 (22:37 +0300)]
Add regexp constraints to trace ids

12 days agoUse resourceful routes for api tracepoints
Anton Khorev [Sat, 18 Jan 2025 17:08:07 +0000 (20:08 +0300)]
Use resourceful routes for api tracepoints

12 days agoReplace lookup_friend with lookup_user in FollowsController
Anton Khorev [Sat, 18 Jan 2025 16:35:30 +0000 (19:35 +0300)]
Replace lookup_friend with lookup_user in FollowsController

12 days agoMerge branch 'pull/5512'
Anton Khorev [Sat, 18 Jan 2025 15:23:51 +0000 (18:23 +0300)]
Merge branch 'pull/5512'

12 days agoMerge remote-tracking branch 'upstream/pull/5507'
Tom Hughes [Sat, 18 Jan 2025 12:06:58 +0000 (12:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5507'

12 days agoUse the dark version of TransportMap in dark mode
Marwin Hochfelsner [Thu, 16 Jan 2025 20:16:24 +0000 (21:16 +0100)]
Use the dark version of TransportMap in dark mode

12 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

12 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

12 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'

12 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'

13 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

13 days agoRename friends as followings
Tom Hughes [Fri, 17 Jan 2025 22:57:53 +0000 (22:57 +0000)]
Rename friends as followings

13 days agoRename friends rate limit as follows
Tom Hughes [Fri, 17 Jan 2025 22:56:48 +0000 (22:56 +0000)]
Rename friends rate limit as follows

13 days agoDrop rubocop exclusions that weren't doing anything
Tom Hughes [Fri, 17 Jan 2025 22:52:30 +0000 (22:52 +0000)]
Drop rubocop exclusions that weren't doing anything

13 days agoRename friendship_notification to follow_notification
Tom Hughes [Fri, 17 Jan 2025 22:48:48 +0000 (22:48 +0000)]
Rename friendship_notification to follow_notification

13 days agoRemove trailing whitespace from translation
Tom Hughes [Fri, 17 Jan 2025 22:48:12 +0000 (22:48 +0000)]
Remove trailing whitespace from translation

13 days agoRename friends_with to follows
Tom Hughes [Fri, 17 Jan 2025 22:42:35 +0000 (22:42 +0000)]
Rename friends_with to follows

13 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

13 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

13 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

13 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.

2 weeks 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

2 weeks 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

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

2 weeks agoBump allowed ECMAScript version to 2021 (ES12)
Tom Hughes [Thu, 16 Jan 2025 19:08:50 +0000 (19:08 +0000)]
Bump allowed ECMAScript version to 2021 (ES12)

2 weeks 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'

2 weeks 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'

2 weeks 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'

2 weeks 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'

2 weeks 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'

2 weeks 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

2 weeks 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.

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

2 weeks 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>
2 weeks 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

2 weeks 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.

2 weeks 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

2 weeks 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'

2 weeks 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

2 weeks 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.

2 weeks 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.

2 weeks 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>
2 weeks 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

2 weeks 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'

2 weeks 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'

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

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

2 weeks 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).

2 weeks 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

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

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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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

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

2 weeks 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

2 weeks 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).

2 weeks 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'

2 weeks 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'

2 weeks 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.

2 weeks 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

2 weeks 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>
3 weeks 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'

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

3 weeks 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

3 weeks 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

3 weeks 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'

3 weeks 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

3 weeks 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

3 weeks 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

3 weeks 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

3 weeks 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'

3 weeks 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

3 weeks 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'

3 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>
3 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'

3 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'

3 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'