]> git.openstreetmap.org Git - rails.git/log
rails.git
6 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'

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

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

6 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

6 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

6 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

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

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

6 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

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

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

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

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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

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

6 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

6 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

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

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

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

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

7 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

7 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

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

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

7 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

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

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

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

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

7 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

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

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

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

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

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

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

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

8 weeks agoBump eslint from 9.13.0 to 9.14.0
dependabot[bot] [Fri, 1 Nov 2024 23:03:47 +0000 (23:03 +0000)]
Bump eslint from 9.13.0 to 9.14.0

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

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

Signed-off-by: dependabot[bot] <support@github.com>
8 weeks agoMerge remote-tracking branch 'upstream/pull/5284'
Tom Hughes [Thu, 31 Oct 2024 18:00:39 +0000 (18:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5284'

8 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 31 Oct 2024 12:14:06 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

8 weeks agoUpdate to rails 7.2.2
Tom Hughes [Thu, 31 Oct 2024 08:33:36 +0000 (08:33 +0000)]
Update to rails 7.2.2

2 months agoAdjust imports for leaflet.locatecontrol
Tom Hughes [Wed, 30 Oct 2024 18:41:43 +0000 (18:41 +0000)]
Adjust imports for leaflet.locatecontrol

2 months agoMerge remote-tracking branch 'upstream/pull/5296'
Tom Hughes [Wed, 30 Oct 2024 18:31:52 +0000 (18:31 +0000)]
Merge remote-tracking branch 'upstream/pull/5296'

2 months agoCreate base and head branches before running danger
Tom Hughes [Tue, 29 Oct 2024 22:13:44 +0000 (22:13 +0000)]
Create base and head branches before running danger

2 months agoBump leaflet.locatecontrol from 0.81.1 to 0.82.0
dependabot[bot] [Tue, 29 Oct 2024 23:27:14 +0000 (23:27 +0000)]
Bump leaflet.locatecontrol from 0.81.1 to 0.82.0

Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.81.1 to 0.82.0.
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.81.1...v0.82.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 months agoUpdate bundle
Tom Hughes [Tue, 29 Oct 2024 18:14:36 +0000 (18:14 +0000)]
Update bundle

2 months agoSubscribe users when they interact with notes
Anton Khorev [Wed, 23 Oct 2024 22:37:39 +0000 (01:37 +0300)]
Subscribe users when they interact with notes

2 months agoCreate note subscription table and model
Anton Khorev [Tue, 22 Oct 2024 23:08:27 +0000 (02:08 +0300)]
Create note subscription table and model

2 months agoMerge pull request #5290 from tomhughes/danger
Andy Allan [Sun, 27 Oct 2024 12:31:51 +0000 (12:31 +0000)]
Merge pull request #5290 from tomhughes/danger

Improvements to danger workflow

2 months agoMerge remote-tracking branch 'upstream/pull/5292'
Tom Hughes [Sun, 27 Oct 2024 10:07:39 +0000 (10:07 +0000)]
Merge remote-tracking branch 'upstream/pull/5292'

2 months agoMerge remote-tracking branch 'upstream/pull/5291'
Tom Hughes [Sun, 27 Oct 2024 10:06:13 +0000 (10:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5291'

2 months agoConsistent use of quotes
Amir E. Aharoni [Sat, 26 Oct 2024 13:22:12 +0000 (09:22 -0400)]
Consistent use of quotes

Most strings used single quotes, and a few used
opening backticks. Now it's single quotes everywhere.

2 months agoAdd articles before "exit" and "roundabout"
Amir E. Aharoni [Sat, 26 Oct 2024 13:31:58 +0000 (09:31 -0400)]
Add articles before "exit" and "roundabout"

There are articles before "ramp" everywhere,
and it sounds more correct with articles
before "exit" and "roundabout", too.

2 months agoMake danger labels use consisent capitalisation
Tom Hughes [Sat, 26 Oct 2024 11:17:38 +0000 (12:17 +0100)]
Make danger labels use consisent capitalisation

Existing labels are all lower case and avoid spaces.

2 months agoAvoid suggesting danger is only about labels
Tom Hughes [Sat, 26 Oct 2024 11:15:44 +0000 (12:15 +0100)]
Avoid suggesting danger is only about labels

2 months agoGet danger working in GitHub actions
Tom Hughes [Sat, 26 Oct 2024 11:12:15 +0000 (12:12 +0100)]
Get danger working in GitHub actions

2 months agoMerge remote-tracking branch 'upstream/pull/5289'
Tom Hughes [Sat, 26 Oct 2024 10:16:45 +0000 (11:16 +0100)]
Merge remote-tracking branch 'upstream/pull/5289'

2 months agoMerge remote-tracking branch 'upstream/pull/5288'
Tom Hughes [Sat, 26 Oct 2024 10:13:11 +0000 (11:13 +0100)]
Merge remote-tracking branch 'upstream/pull/5288'

2 months agoMerge remote-tracking branch 'upstream/pull/5286'
Tom Hughes [Sat, 26 Oct 2024 10:12:24 +0000 (11:12 +0100)]
Merge remote-tracking branch 'upstream/pull/5286'

2 months agoAvoid adjusting time by a number of days
Tom Hughes [Fri, 25 Oct 2024 18:30:27 +0000 (19:30 +0100)]
Avoid adjusting time by a number of days

Using hours instead of days avoids test failures when moving
past a point in time when the clocks change.

2 months agoRemove callback from initialize() in note js controller
Anton Khorev [Fri, 25 Oct 2024 15:48:36 +0000 (18:48 +0300)]
Remove callback from initialize() in note js controller

2 months agoDecrease padding between close button and inputs in directions form
Anton Khorev [Fri, 25 Oct 2024 15:22:36 +0000 (18:22 +0300)]
Decrease padding between close button and inputs in directions form

2 months agoBump coverallsapp/github-action from 2.3.3 to 2.3.4
dependabot[bot] [Thu, 24 Oct 2024 23:01:43 +0000 (23:01 +0000)]
Bump coverallsapp/github-action from 2.3.3 to 2.3.4

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.3 to 2.3.4.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.3.3...v2.3.4)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 24 Oct 2024 12:17:17 +0000 (14:17 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoUpdate bundle
Tom Hughes [Thu, 24 Oct 2024 07:58:45 +0000 (08:58 +0100)]
Update bundle

2 months agoUpdate to rails 7.2.1.2
Tom Hughes [Thu, 24 Oct 2024 07:57:57 +0000 (08:57 +0100)]
Update to rails 7.2.1.2

2 months agoRevert to using released version of canonical-rails
Tom Hughes [Thu, 24 Oct 2024 07:57:25 +0000 (08:57 +0100)]
Revert to using released version of canonical-rails

2 months agoGet danger working on pull requests
Tom Hughes [Tue, 22 Oct 2024 18:06:19 +0000 (19:06 +0100)]
Get danger working on pull requests

2 months agoUpdate bundle
Tom Hughes [Tue, 22 Oct 2024 17:16:19 +0000 (18:16 +0100)]
Update bundle

2 months agoMerge remote-tracking branch 'upstream/pull/5276'
Tom Hughes [Mon, 21 Oct 2024 21:45:04 +0000 (22:45 +0100)]
Merge remote-tracking branch 'upstream/pull/5276'

2 months agoAttempt to get danger working
Tom Hughes [Mon, 21 Oct 2024 19:34:39 +0000 (20:34 +0100)]
Attempt to get danger working

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 21 Oct 2024 12:15:37 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoDon't show older/newer buttons if all items fit on one page
Anton Khorev [Mon, 21 Oct 2024 11:51:35 +0000 (14:51 +0300)]
Don't show older/newer buttons if all items fit on one page

2 months agoMerge remote-tracking branch 'upstream/pull/5274'
Tom Hughes [Sun, 20 Oct 2024 16:39:31 +0000 (17:39 +0100)]
Merge remote-tracking branch 'upstream/pull/5274'

2 months agoMerge remote-tracking branch 'upstream/pull/5273'
Tom Hughes [Sun, 20 Oct 2024 16:38:03 +0000 (17:38 +0100)]
Merge remote-tracking branch 'upstream/pull/5273'

2 months agoMerge remote-tracking branch 'upstream/pull/5271'
Tom Hughes [Sun, 20 Oct 2024 16:37:49 +0000 (17:37 +0100)]
Merge remote-tracking branch 'upstream/pull/5271'

2 months agoRemove "User's Diary" from diary entry og:title
Anton Khorev [Sun, 20 Oct 2024 16:10:36 +0000 (19:10 +0300)]
Remove "User's Diary" from diary entry og:title

2 months agoTypos in docs
Jakob Miksch [Sun, 20 Oct 2024 09:12:49 +0000 (11:12 +0200)]
Typos in docs

2 months agoBump eslint from 9.12.0 to 9.13.0
dependabot[bot] [Fri, 18 Oct 2024 23:40:19 +0000 (23:40 +0000)]
Bump eslint from 9.12.0 to 9.13.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.12.0 to 9.13.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.12.0...v9.13.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 months agoAttempt to get danger working as a CI workflow
Tom Hughes [Thu, 17 Oct 2024 17:41:05 +0000 (18:41 +0100)]
Attempt to get danger working as a CI workflow

References #5267

2 months agoMerge remote-tracking branch 'upstream/pull/5268'
Tom Hughes [Thu, 17 Oct 2024 17:10:04 +0000 (18:10 +0100)]
Merge remote-tracking branch 'upstream/pull/5268'

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 17 Oct 2024 12:16:07 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoBump coverallsapp/github-action from 2.3.2 to 2.3.3
dependabot[bot] [Wed, 16 Oct 2024 23:06:28 +0000 (23:06 +0000)]
Bump coverallsapp/github-action from 2.3.2 to 2.3.3

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.2 to 2.3.3.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.3.2...v2.3.3)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2 months agoUpdate to rails 7.2.1.1
Tom Hughes [Wed, 16 Oct 2024 18:05:50 +0000 (19:05 +0100)]
Update to rails 7.2.1.1

2 months agoMerge remote-tracking branch 'upstream/pull/5246'
Tom Hughes [Wed, 16 Oct 2024 18:05:18 +0000 (19:05 +0100)]
Merge remote-tracking branch 'upstream/pull/5246'

2 months agoMerge remote-tracking branch 'upstream/pull/5266'
Tom Hughes [Wed, 16 Oct 2024 17:38:48 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/5266'

2 months agoAvoid linking to redirects on the osmfoundation website
Andy Allan [Wed, 16 Oct 2024 16:40:24 +0000 (17:40 +0100)]
Avoid linking to redirects on the osmfoundation website

2 months agoMerge pull request #4919 from rkoeze/rkoeze/add-github-pr-template
Andy Allan [Wed, 16 Oct 2024 16:19:41 +0000 (17:19 +0100)]
Merge pull request #4919 from rkoeze/rkoeze/add-github-pr-template

Add pull request template

2 months agoMerge pull request #5216 from kcne/teaspoon-v2
Andy Allan [Wed, 16 Oct 2024 15:55:33 +0000 (16:55 +0100)]
Merge pull request #5216 from kcne/teaspoon-v2

Re-enable JavaScript unit tests using Teaspoon

2 months agoMerge pull request #4988 from nenad-vujicic/issue_4912_pr_labeling
Andy Allan [Wed, 16 Oct 2024 13:29:59 +0000 (14:29 +0100)]
Merge pull request #4988 from nenad-vujicic/issue_4912_pr_labeling

Added workflow for PR labeling using Danger

2 months agoRephrase translation label, and fix link to docs
Andy Allan [Wed, 16 Oct 2024 13:29:39 +0000 (14:29 +0100)]
Rephrase translation label, and fix link to docs

2 months agoMerge remote-tracking branch 'upstream/pull/5263'
Tom Hughes [Tue, 15 Oct 2024 23:32:52 +0000 (00:32 +0100)]
Merge remote-tracking branch 'upstream/pull/5263'