]> git.openstreetmap.org Git - rails.git/log
rails.git
2 weeks agoMerge remote-tracking branch 'upstream/pull/5372'
Tom Hughes [Tue, 3 Dec 2024 18:36:23 +0000 (18:36 +0000)]
Merge remote-tracking branch 'upstream/pull/5372'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5371'
Tom Hughes [Tue, 3 Dec 2024 18:33:38 +0000 (18:33 +0000)]
Merge remote-tracking branch 'upstream/pull/5371'

2 weeks agoUpdate bundle
Tom Hughes [Tue, 3 Dec 2024 18:19:50 +0000 (18:19 +0000)]
Update bundle

2 weeks agoTruncate if necessary and set dir=auto for message usernames
Anton Khorev [Tue, 3 Dec 2024 07:48:59 +0000 (10:48 +0300)]
Truncate if necessary and set dir=auto for message usernames

2 weeks agoTruncate if necessary and set dir=auto for changeset usernames
Anton Khorev [Tue, 3 Dec 2024 07:24:56 +0000 (10:24 +0300)]
Truncate if necessary and set dir=auto for changeset usernames

3 weeks agoMerge remote-tracking branch 'upstream/pull/5366'
Tom Hughes [Mon, 2 Dec 2024 15:00:45 +0000 (15:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5366'

3 weeks agoMerge remote-tracking branch 'upstream/pull/5365'
Tom Hughes [Mon, 2 Dec 2024 15:00:42 +0000 (15:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5365'

3 weeks agoMerge remote-tracking branch 'upstream/pull/5364'
Tom Hughes [Mon, 2 Dec 2024 15:00:39 +0000 (15:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5364'

3 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 2 Dec 2024 12:14:19 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

3 weeks agoTruncate usernames in block navigation tabs
Anton Khorev [Mon, 2 Dec 2024 09:22:45 +0000 (12:22 +0300)]
Truncate usernames in block navigation tabs

3 weeks agoSet dir=auto on usernames in block lists
Anton Khorev [Mon, 2 Dec 2024 09:02:04 +0000 (12:02 +0300)]
Set dir=auto on usernames in block lists

3 weeks agoSet dir=auto on username in header
Anton Khorev [Mon, 2 Dec 2024 07:56:23 +0000 (10:56 +0300)]
Set dir=auto on username in header

3 weeks agoMerge remote-tracking branch 'upstream/pull/5360'
Tom Hughes [Sun, 1 Dec 2024 19:25:10 +0000 (19:25 +0000)]
Merge remote-tracking branch 'upstream/pull/5360'

3 weeks agoBump eslint from 9.15.0 to 9.16.0
dependabot[bot] [Fri, 29 Nov 2024 23:47:00 +0000 (23:47 +0000)]
Bump eslint from 9.15.0 to 9.16.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.15.0 to 9.16.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.15.0...v9.16.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 agoDon't send comment text when reopening a note
Tom Hughes [Fri, 29 Nov 2024 17:41:00 +0000 (17:41 +0000)]
Don't send comment text when reopening a note

Fixes #5359.

3 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 28 Nov 2024 12:14:20 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

3 weeks agoMove html_safe declaration for user_mailer from layout to helper
Andy Allan [Wed, 27 Nov 2024 18:04:32 +0000 (18:04 +0000)]
Move html_safe declaration for user_mailer from layout to helper

This allows us to enable output safety checks for all code within
erb files.

`rubocop --auto-gen-config` ignores code within the erb files, so
it is easier to maintain an exclusion on the helper than inside
the layout.

3 weeks agoMerge remote-tracking branch 'upstream/pull/5357'
Tom Hughes [Wed, 27 Nov 2024 17:55:09 +0000 (17:55 +0000)]
Merge remote-tracking branch 'upstream/pull/5357'

3 weeks agoResolve erb_lint deprecations
Andy Allan [Wed, 27 Nov 2024 17:10:08 +0000 (17:10 +0000)]
Resolve erb_lint deprecations

They have standardized on underscores. See
https://github.com/Shopify/erb_lint/pull/360

3 weeks agoMerge pull request #4316 from AntonKhorev/block-reason-max-length
Andy Allan [Wed, 27 Nov 2024 17:02:25 +0000 (17:02 +0000)]
Merge pull request #4316 from AntonKhorev/block-reason-max-length

Set max length of block reason

3 weeks agoUpdate bundle
Tom Hughes [Tue, 26 Nov 2024 18:38:29 +0000 (18:38 +0000)]
Update bundle

4 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 Nov 2024 12:14:48 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

4 weeks agoMerge remote-tracking branch 'upstream/pull/5353'
Tom Hughes [Sun, 24 Nov 2024 10:40:39 +0000 (10:40 +0000)]
Merge remote-tracking branch 'upstream/pull/5353'

4 weeks agoAdd default browse icons for nodes, ways, relations
Anton Khorev [Sun, 24 Nov 2024 00:04:11 +0000 (03:04 +0300)]
Add default browse icons for nodes, ways, relations

4 weeks agoMerge remote-tracking branch 'upstream/pull/5349'
Tom Hughes [Fri, 22 Nov 2024 17:51:49 +0000 (17:51 +0000)]
Merge remote-tracking branch 'upstream/pull/5349'

4 weeks agoMove layer definitions to yml
Anton Khorev [Thu, 21 Nov 2024 22:18:55 +0000 (01:18 +0300)]
Move layer definitions to yml

4 weeks agoMerge remote-tracking branch 'upstream/pull/5346'
Tom Hughes [Thu, 21 Nov 2024 22:13:33 +0000 (22:13 +0000)]
Merge remote-tracking branch 'upstream/pull/5346'

4 weeks agoMove map layer ids/codes/keys to layer definition data
Anton Khorev [Thu, 21 Nov 2024 17:58:47 +0000 (20:58 +0300)]
Move map layer ids/codes/keys to layer definition data

4 weeks agoAdd subscribe/unsubscribe buttons to note pages
Anton Khorev [Thu, 24 Oct 2024 03:02:07 +0000 (06:02 +0300)]
Add subscribe/unsubscribe buttons to note pages

4 weeks agoMerge remote-tracking branch 'upstream/pull/5348'
Tom Hughes [Thu, 21 Nov 2024 18:58:14 +0000 (18:58 +0000)]
Merge remote-tracking branch 'upstream/pull/5348'

4 weeks agoCollect map layer credits into a data structure
Anton Khorev [Thu, 21 Nov 2024 17:08:43 +0000 (20:08 +0300)]
Collect map layer credits into a data structure

4 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 21 Nov 2024 12:15:02 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

4 weeks agoMerge pull request #5314 from AntonKhorev/note-subscriptions-api
Andy Allan [Wed, 20 Nov 2024 18:21:11 +0000 (18:21 +0000)]
Merge pull request #5314 from AntonKhorev/note-subscriptions-api

Note subscriptions API

4 weeks agoAdd destroy note subscription api endpoint
Anton Khorev [Thu, 24 Oct 2024 01:46:57 +0000 (04:46 +0300)]
Add destroy note subscription api endpoint

4 weeks agoAdd create note subscription api endpoint
Anton Khorev [Thu, 24 Oct 2024 01:11:37 +0000 (04:11 +0300)]
Add create note subscription api endpoint

4 weeks agoUpdate bundle
Tom Hughes [Tue, 19 Nov 2024 18:21:14 +0000 (18:21 +0000)]
Update bundle

4 weeks agoMerge remote-tracking branch 'upstream/pull/5341'
Tom Hughes [Tue, 19 Nov 2024 18:10:38 +0000 (18:10 +0000)]
Merge remote-tracking branch 'upstream/pull/5341'

5 weeks agoBump qs from 6.13.0 to 6.13.1
dependabot[bot] [Tue, 19 Nov 2024 00:15:49 +0000 (00:15 +0000)]
Bump qs from 6.13.0 to 6.13.1

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

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

Signed-off-by: dependabot[bot] <support@github.com>
5 weeks agoMerge branch 'pull/5297'
Anton Khorev [Mon, 18 Nov 2024 15:15:25 +0000 (18:15 +0300)]
Merge branch 'pull/5297'

5 weeks agoAdd status filter to user's note page
Emin Kocan [Wed, 30 Oct 2024 21:00:59 +0000 (22:00 +0100)]
Add status filter to user's note page

5 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Nov 2024 12:14:43 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

5 weeks agoMerge remote-tracking branch 'upstream/pull/5335'
Tom Hughes [Sun, 17 Nov 2024 18:48:37 +0000 (18:48 +0000)]
Merge remote-tracking branch 'upstream/pull/5335'

5 weeks agoMerge remote-tracking branch 'upstream/pull/5334'
Tom Hughes [Sun, 17 Nov 2024 18:46:45 +0000 (18:46 +0000)]
Merge remote-tracking branch 'upstream/pull/5334'

5 weeks agoMerge branch 'pull/5338'
Anton Khorev [Sun, 17 Nov 2024 16:59:20 +0000 (19:59 +0300)]
Merge branch 'pull/5338'

5 weeks agoEnable dark mode attribution font color
Marwin Hochfelsner [Sun, 17 Nov 2024 14:28:06 +0000 (15:28 +0100)]
Enable dark mode attribution font color

Increases the specificity of the dark mode attribution selector. This makes it overwrite Leaflet's default link selector.

5 weeks agoBump eslint from 9.14.0 to 9.15.0
dependabot[bot] [Fri, 15 Nov 2024 23:31:58 +0000 (23:31 +0000)]
Bump eslint from 9.14.0 to 9.15.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.14.0 to 9.15.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.14.0...v9.15.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
5 weeks agoBump @eslint/plugin-kit from 0.2.0 to 0.2.3
dependabot[bot] [Fri, 15 Nov 2024 21:01:29 +0000 (21:01 +0000)]
Bump @eslint/plugin-kit from 0.2.0 to 0.2.3

Bumps [@eslint/plugin-kit](https://github.com/eslint/rewrite) from 0.2.0 to 0.2.3.
- [Release notes](https://github.com/eslint/rewrite/releases)
- [Changelog](https://github.com/eslint/rewrite/blob/main/release-please-config.json)
- [Commits](https://github.com/eslint/rewrite/compare/core-v0.2.0...plugin-kit-v0.2.3)

---
updated-dependencies:
- dependency-name: "@eslint/plugin-kit"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
5 weeks agoMerge pull request #5333 from AntonKhorev/auth-buttons-same-as-preferred
Andy Allan [Fri, 15 Nov 2024 16:15:05 +0000 (16:15 +0000)]
Merge pull request #5333 from AntonKhorev/auth-buttons-same-as-preferred

Style small auth buttons similarly to preferred auth buttons

5 weeks agoMerge pull request #5331 from AntonKhorev/trace-badges-text-bg
Andy Allan [Fri, 15 Nov 2024 16:14:02 +0000 (16:14 +0000)]
Merge pull request #5331 from AntonKhorev/trace-badges-text-bg

Set colors for trace visibility badges using .text-bg-*

5 weeks agoMerge pull request #5332 from AntonKhorev/layer-preview-backgrounds
Andy Allan [Fri, 15 Nov 2024 16:11:38 +0000 (16:11 +0000)]
Merge pull request #5332 from AntonKhorev/layer-preview-backgrounds

Set background for layer buttons to secondary body color

5 weeks agoStyle small auth buttons similarly to preferred auth buttons
Anton Khorev [Fri, 15 Nov 2024 16:09:57 +0000 (19:09 +0300)]
Style small auth buttons similarly to preferred auth buttons

5 weeks agoSet background for layer buttons to secondary body color
Anton Khorev [Fri, 15 Nov 2024 15:33:16 +0000 (18:33 +0300)]
Set background for layer buttons to secondary body color

5 weeks agoSet colors for trace visibility badges using .text-bg-*
Anton Khorev [Fri, 15 Nov 2024 15:09:03 +0000 (18:09 +0300)]
Set colors for trace visibility badges using .text-bg-*

5 weeks agoMerge pull request #5330 from AntonKhorev/apply-tile-filter-once
Andy Allan [Fri, 15 Nov 2024 14:48:49 +0000 (14:48 +0000)]
Merge pull request #5330 from AntonKhorev/apply-tile-filter-once

Apply dimming filter to tiles directly

5 weeks agoApply dimming filter to tiles directly
Anton Khorev [Fri, 15 Nov 2024 14:38:02 +0000 (17:38 +0300)]
Apply dimming filter to tiles directly

5 weeks agoMerge remote-tracking branch 'upstream/pull/5320'
Tom Hughes [Thu, 14 Nov 2024 17:57:23 +0000 (17:57 +0000)]
Merge remote-tracking branch 'upstream/pull/5320'

5 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Nov 2024 12:15:08 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

5 weeks agoRemove jQuery.timers plugin
Anton Khorev [Thu, 14 Nov 2024 10:43:41 +0000 (13:43 +0300)]
Remove jQuery.timers plugin

5 weeks agoMerge pull request #4761 from AntonKhorev:dark-mode-with-close-button
Andy Allan [Wed, 13 Nov 2024 20:25:50 +0000 (20:25 +0000)]
Merge pull request #4761 from AntonKhorev:dark-mode-with-close-button

Enable dark theme if user prefers dark color scheme - no javascript version

5 weeks agoMerge pull request #5151 from AntonKhorev/no-history-and-export-buttons
Andy Allan [Wed, 13 Nov 2024 19:15:59 +0000 (19:15 +0000)]
Merge pull request #5151 from AntonKhorev/no-history-and-export-buttons

Move History and Export buttons to secondary nav

5 weeks agoMerge pull request #5293 from AntonKhorev/user-roles-resourceful-routes
Andy Allan [Wed, 13 Nov 2024 18:45:16 +0000 (18:45 +0000)]
Merge pull request #5293 from AntonKhorev/user-roles-resourceful-routes

Use resourceful routes for granting/revoking user roles

5 weeks agoMerge remote-tracking branch 'upstream/pull/5319'
Tom Hughes [Wed, 13 Nov 2024 18:40:02 +0000 (18:40 +0000)]
Merge remote-tracking branch 'upstream/pull/5319'

5 weeks agoMerge remote-tracking branch 'upstream/pull/5318'
Tom Hughes [Wed, 13 Nov 2024 18:38:59 +0000 (18:38 +0000)]
Merge remote-tracking branch 'upstream/pull/5318'

5 weeks agoMerge pull request #5158 from tomhughes/vagrant-debian
Andy Allan [Wed, 13 Nov 2024 17:27:46 +0000 (17:27 +0000)]
Merge pull request #5158 from tomhughes/vagrant-debian

Switch vagrant to use Debian 12

5 weeks agoAdd note on assigning issues
Andy Allan [Wed, 13 Nov 2024 12:14:29 +0000 (12:14 +0000)]
Add note on assigning issues

New users are encouraged by Github to read the CONTRIBUTING file,
so that's where it's worth putting it. The explanation of why can
be put elsewhere.

5 weeks agoMerge remote-tracking branch 'upstream/pull/5316'
Tom Hughes [Wed, 13 Nov 2024 17:05:12 +0000 (17:05 +0000)]
Merge remote-tracking branch 'upstream/pull/5316'

5 weeks agoMerge remote-tracking branch 'upstream/pull/5315'
Tom Hughes [Wed, 13 Nov 2024 17:00:06 +0000 (17:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5315'

5 weeks agoMerge remote-tracking branch 'upstream/pull/5312'
Tom Hughes [Wed, 13 Nov 2024 16:55:44 +0000 (16:55 +0000)]
Merge remote-tracking branch 'upstream/pull/5312'

5 weeks agoSwitch vagrant to use Debian 12
Tom Hughes [Thu, 5 Sep 2024 16:55:43 +0000 (17:55 +0100)]
Switch vagrant to use Debian 12

5 weeks agoMerge pull request #5295 from tomhughes/danger-branches
Andy Allan [Wed, 13 Nov 2024 16:07:41 +0000 (16:07 +0000)]
Merge pull request #5295 from tomhughes/danger-branches

Create base and head branches before running danger

5 weeks agoMerge pull request #5303 from tomhughes/remember-me
Andy Allan [Wed, 13 Nov 2024 16:05:03 +0000 (16:05 +0000)]
Merge pull request #5303 from tomhughes/remember-me

Make the "remember me" option work as intended

5 weeks agoRemove unused timer from new note js controller
Anton Khorev [Wed, 13 Nov 2024 12:54:20 +0000 (15:54 +0300)]
Remove unused timer from new note js controller

5 weeks agoMake the "remember me" option work as intended
Tom Hughes [Tue, 5 Nov 2024 18:42:20 +0000 (18:42 +0000)]
Make the "remember me" option work as intended

5 weeks agoShow spinner using delayed css animation in sidebar loader
Anton Khorev [Wed, 13 Nov 2024 12:15:54 +0000 (15:15 +0300)]
Show spinner using delayed css animation in sidebar loader

5 weeks agoAdd yaml syntax highlighting to code blocks
Andy Allan [Wed, 13 Nov 2024 12:14:01 +0000 (12:14 +0000)]
Add yaml syntax highlighting to code blocks

5 weeks agoShow spinner using delayed css animation in richtext preview
Anton Khorev [Wed, 13 Nov 2024 12:05:20 +0000 (15:05 +0300)]
Show spinner using delayed css animation in richtext preview

5 weeks agoAdd missing headers to docs
Andy Allan [Wed, 13 Nov 2024 11:51:50 +0000 (11:51 +0000)]
Add missing headers to docs

5 weeks agoUse fenced code blocks
Andy Allan [Wed, 13 Nov 2024 11:44:41 +0000 (11:44 +0000)]
Use fenced code blocks

For consistency with other documentation

5 weeks agoDon't update deactivates_at if block was already viewed
Anton Khorev [Mon, 11 Nov 2024 14:54:52 +0000 (17:54 +0300)]
Don't update deactivates_at if block was already viewed

5 weeks agoMerge remote-tracking branch 'upstream/pull/5310'
Tom Hughes [Tue, 12 Nov 2024 19:01:22 +0000 (19:01 +0000)]
Merge remote-tracking branch 'upstream/pull/5310'

5 weeks agoMerge remote-tracking branch 'upstream/pull/5311'
Tom Hughes [Tue, 12 Nov 2024 18:54:36 +0000 (18:54 +0000)]
Merge remote-tracking branch 'upstream/pull/5311'

5 weeks agoUpdate bundle
Tom Hughes [Tue, 12 Nov 2024 17:10:52 +0000 (17:10 +0000)]
Update bundle

6 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 11 Nov 2024 12:13:21 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

6 weeks agoRestore loading spinner in richtext previews
Anton Khorev [Fri, 8 Nov 2024 12:04:38 +0000 (15:04 +0300)]
Restore loading spinner in richtext previews

6 weeks agoSend notifications to note subscribers instead of commenters
Anton Khorev [Wed, 23 Oct 2024 23:25:27 +0000 (02:25 +0300)]
Send notifications to note subscribers instead of commenters

6 weeks agoMerge remote-tracking branch 'upstream/pull/5307'
Tom Hughes [Fri, 8 Nov 2024 08:03:41 +0000 (08:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5307'

6 weeks agoMerge remote-tracking branch 'upstream/pull/5304'
Tom Hughes [Fri, 8 Nov 2024 08:03:28 +0000 (08:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5304'

6 weeks agoReplace query marker fade animation with css
Anton Khorev [Thu, 7 Nov 2024 08:39:54 +0000 (11:39 +0300)]
Replace query marker fade animation with css

6 weeks agoBackfill note subscriptions
Anton Khorev [Wed, 23 Oct 2024 15:20:25 +0000 (18:20 +0300)]
Backfill note subscriptions

6 weeks agoMerge remote-tracking branch 'upstream/pull/4464'
Tom Hughes [Thu, 7 Nov 2024 18:49:45 +0000 (18:49 +0000)]
Merge remote-tracking branch 'upstream/pull/4464'

6 weeks agoRemove hardcoded rate limit value
gobinathal [Mon, 8 Jan 2024 16:59:34 +0000 (22:29 +0530)]
Remove hardcoded rate limit value

Name is chosen to match the equivalent setting in the configuration
of the rate limits for edits.

Fixes #4427.

6 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 7 Nov 2024 12:13:21 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

6 weeks agoUse resourceful routes for granting/revoking user roles
Anton Khorev [Mon, 28 Oct 2024 00:44:10 +0000 (03:44 +0300)]
Use resourceful routes for granting/revoking user roles

6 weeks agoFix new rubocop warnings
Tom Hughes [Tue, 5 Nov 2024 18:22:02 +0000 (18:22 +0000)]
Fix new rubocop warnings

6 weeks agoUpdate bundle
Tom Hughes [Tue, 5 Nov 2024 18:12:25 +0000 (18:12 +0000)]
Update bundle

6 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 5 Nov 2024 14:31:10 +0000 (15:31 +0100)]
Localisation updates from https://translatewiki.net.

7 weeks agoMerge remote-tracking branch 'upstream/pull/5301'
Tom Hughes [Mon, 4 Nov 2024 19:02:14 +0000 (19:02 +0000)]
Merge remote-tracking branch 'upstream/pull/5301'

7 weeks agoAdded new Danger labeling rule
Nenad Vujicic [Mon, 4 Nov 2024 15:54:30 +0000 (16:54 +0100)]
Added new Danger labeling rule

Added new rule which checks if Gemfile is updated and Gemfile.lock is not updated and if positive generates "gemfile-lock-outdated" PR label.

7 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 4 Nov 2024 12:13:41 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

7 weeks agoMerge remote-tracking branch 'upstream/pull/5299'
Tom Hughes [Sun, 3 Nov 2024 18:53:12 +0000 (18:53 +0000)]
Merge remote-tracking branch 'upstream/pull/5299'