]> git.openstreetmap.org Git - rails.git/log
rails.git
46 min agoMerge remote-tracking branch 'upstream/pull/6811' master
Tom Hughes [Tue, 23 Jun 2026 19:39:03 +0000 (20:39 +0100)]
Merge remote-tracking branch 'upstream/pull/6811'

62 min agoMerge remote-tracking branch 'upstream/pull/7174'
Tom Hughes [Tue, 23 Jun 2026 19:22:58 +0000 (20:22 +0100)]
Merge remote-tracking branch 'upstream/pull/7174'

79 min agoRemove dangling top-level block
Marwin Hochfelsner [Mon, 22 Jun 2026 01:24:08 +0000 (03:24 +0200)]
Remove dangling top-level block

79 min agoRemove history submodules from OSM scope
Marwin Hochfelsner [Mon, 22 Jun 2026 01:14:21 +0000 (03:14 +0200)]
Remove history submodules from OSM scope

80 min agoRemove directions submodules from OSM scope
Marwin Hochfelsner [Mon, 22 Jun 2026 01:11:09 +0000 (03:11 +0200)]
Remove directions submodules from OSM scope

81 min agoCollapse OSM.Directions namespace
Marwin Hochfelsner [Mon, 22 Jun 2026 01:09:41 +0000 (03:09 +0200)]
Collapse OSM.Directions namespace

83 min agoRescope ContextMenu
Marwin Hochfelsner [Mon, 22 Jun 2026 01:03:21 +0000 (03:03 +0200)]
Rescope ContextMenu

85 min agoMerge pull request #7173 from tomhughes/module-includes
Marwin Hochfelsner [Tue, 23 Jun 2026 19:00:04 +0000 (21:00 +0200)]
Merge pull request #7173 from tomhughes/module-includes

Move module includes to group them with the modules that use them

2 hours agoMove includes for directions module to index_modules
Tom Hughes [Tue, 23 Jun 2026 18:16:58 +0000 (19:16 +0100)]
Move includes for directions module to index_modules

2 hours agoMove include for history module to index_modules
Tom Hughes [Tue, 23 Jun 2026 18:16:13 +0000 (19:16 +0100)]
Move include for history module to index_modules

2 hours agoMerge remote-tracking branch 'upstream/pull/7147'
Tom Hughes [Tue, 23 Jun 2026 18:07:44 +0000 (19:07 +0100)]
Merge remote-tracking branch 'upstream/pull/7147'

2 hours agoRemove jQuery throttle-debounce dependency
Marwin Hochfelsner [Fri, 13 Feb 2026 04:04:55 +0000 (05:04 +0100)]
Remove jQuery throttle-debounce dependency

3 hours agoMerge remote-tracking branch 'upstream/pull/7172'
Tom Hughes [Tue, 23 Jun 2026 17:17:55 +0000 (18:17 +0100)]
Merge remote-tracking branch 'upstream/pull/7172'

5 hours agoupdate iD to v2.41.1
Martin Raifer [Tue, 23 Jun 2026 15:21:06 +0000 (17:21 +0200)]
update iD to v2.41.1

7 hours agoMerge remote-tracking branch 'upstream/pull/7171' live
Tom Hughes [Tue, 23 Jun 2026 13:24:18 +0000 (14:24 +0100)]
Merge remote-tracking branch 'upstream/pull/7171'

7 hours agoBump nokogiri from 1.19.3 to 1.19.4
dependabot[bot] [Tue, 23 Jun 2026 13:09:46 +0000 (13:09 +0000)]
Bump nokogiri from 1.19.3 to 1.19.4

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.19.3 to 1.19.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.19.3...v1.19.4)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-version: 1.19.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
27 hours agoMigrate js controllers to lazy loaded modules
Marwin Hochfelsner [Mon, 22 Jun 2026 00:46:53 +0000 (02:46 +0200)]
Migrate js controllers to lazy loaded modules

27 hours agoCollect initializations outside of modules
Marwin Hochfelsner [Tue, 9 Jun 2026 21:43:26 +0000 (21:43 +0000)]
Collect initializations outside of modules

27 hours agoCollect module paths in dict
Marwin Hochfelsner [Tue, 9 Jun 2026 21:16:03 +0000 (21:16 +0000)]
Collect module paths in dict

27 hours agoReduce redundancy in router navigation handling
Marwin Hochfelsner [Mon, 22 Jun 2026 16:37:52 +0000 (18:37 +0200)]
Reduce redundancy in router navigation handling

30 hours agoMerge pull request #7170 from openstreetmap/translatewiki
Andy Allan [Mon, 22 Jun 2026 14:10:16 +0000 (15:10 +0100)]
Merge pull request #7170 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

32 hours agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Jun 2026 12:16:30 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

2 days agoMerge remote-tracking branch 'upstream/pull/7169'
Tom Hughes [Sun, 21 Jun 2026 17:46:02 +0000 (18:46 +0100)]
Merge remote-tracking branch 'upstream/pull/7169'

2 days agoReplace marker shadow image with vector graphic
Marwin Hochfelsner [Sun, 21 Jun 2026 04:41:19 +0000 (06:41 +0200)]
Replace marker shadow image with vector graphic

5 days agoMerge pull request #7164 from openstreetmap/dependabot/bundler/dependencies-0493874874
Andy Allan [Thu, 18 Jun 2026 14:00:28 +0000 (15:00 +0100)]
Merge pull request #7164 from openstreetmap/dependabot/bundler/dependencies-0493874874

Bump the dependencies group with 6 updates

5 days agoMerge pull request #7166 from openstreetmap/translatewiki
Andy Allan [Thu, 18 Jun 2026 13:30:42 +0000 (14:30 +0100)]
Merge pull request #7166 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

5 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 18 Jun 2026 12:14:51 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.

5 days agoMerge pull request #7163 from openstreetmap/dependabot/npm_and_yarn/dependencies...
Marwin Hochfelsner [Wed, 17 Jun 2026 23:40:48 +0000 (01:40 +0200)]
Merge pull request #7163 from openstreetmap/dependabot/npm_and_yarn/dependencies-6d76de260b

Bump eslint from 10.4.1 to 10.5.0 in the dependencies group

5 days agoMerge pull request #7161 from openstreetmap/dependabot/github_actions/dependencies...
Marwin Hochfelsner [Wed, 17 Jun 2026 23:38:12 +0000 (01:38 +0200)]
Merge pull request #7161 from openstreetmap/dependabot/github_actions/dependencies-10722fb5c6

Bump ruby/setup-ruby from 1.312.0 to 1.313.0 in the dependencies group

5 days agoMerge pull request #7162 from openstreetmap/dependabot/bundler/rubocop-950b9b3410
Marwin Hochfelsner [Wed, 17 Jun 2026 23:37:52 +0000 (01:37 +0200)]
Merge pull request #7162 from openstreetmap/dependabot/bundler/rubocop-950b9b3410

Bump rubocop from 1.87.0 to 1.88.0 in the rubocop group

5 days agoMerge pull request #7157 from pnorman/svwd03
Marwin Hochfelsner [Wed, 17 Jun 2026 23:36:44 +0000 (01:36 +0200)]
Merge pull request #7157 from pnorman/svwd03

Switch from Versatiles Colorful to SVWD03

5 days agoBump the dependencies group with 6 updates
dependabot[bot] [Wed, 17 Jun 2026 23:16:58 +0000 (23:16 +0000)]
Bump the dependencies group with 6 updates

Bumps the dependencies group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) | `5.9.2` | `5.9.3` |
| [faraday](https://github.com/lostisland/faraday) | `2.14.2` | `2.14.3` |
| [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) | `1.225.1` | `1.226.0` |
| [danger](https://github.com/danger/danger) | `9.5.3` | `9.6.0` |
| [brakeman](https://github.com/presidentbeef/brakeman) | `8.0.4` | `8.0.5` |
| [selenium-webdriver](https://github.com/SeleniumHQ/selenium) | `4.44.0` | `4.45.0` |

Updates `doorkeeper` from 5.9.2 to 5.9.3
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.9.2...v5.9.3)

Updates `faraday` from 2.14.2 to 2.14.3
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v2.14.2...v2.14.3)

Updates `aws-sdk-s3` from 1.225.1 to 1.226.0
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Updates `danger` from 9.5.3 to 9.6.0
- [Release notes](https://github.com/danger/danger/releases)
- [Changelog](https://github.com/danger/danger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/danger/danger/compare/v9.5.3...v9.6.0)

Updates `brakeman` from 8.0.4 to 8.0.5
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v8.0.4...v8.0.5)

Updates `selenium-webdriver` from 4.44.0 to 4.45.0
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.44.0...selenium-4.45.0)

---
updated-dependencies:
- dependency-name: doorkeeper
  dependency-version: 5.9.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: faraday
  dependency-version: 2.14.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.226.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: danger
  dependency-version: 9.6.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: brakeman
  dependency-version: 8.0.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: selenium-webdriver
  dependency-version: 4.45.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
5 days agoBump eslint from 10.4.1 to 10.5.0 in the dependencies group
dependabot[bot] [Wed, 17 Jun 2026 23:13:06 +0000 (23:13 +0000)]
Bump eslint from 10.4.1 to 10.5.0 in the dependencies group

Bumps the dependencies group with 1 update: [eslint](https://github.com/eslint/eslint).

Updates `eslint` from 10.4.1 to 10.5.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v10.4.1...v10.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
5 days agoBump rubocop from 1.87.0 to 1.88.0 in the rubocop group
dependabot[bot] [Wed, 17 Jun 2026 23:12:38 +0000 (23:12 +0000)]
Bump rubocop from 1.87.0 to 1.88.0 in the rubocop group

Bumps the rubocop group with 1 update: [rubocop](https://github.com/rubocop/rubocop).

Updates `rubocop` from 1.87.0 to 1.88.0
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.87.0...v1.88.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-version: 1.88.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: rubocop
...

Signed-off-by: dependabot[bot] <support@github.com>
5 days agoBump ruby/setup-ruby from 1.312.0 to 1.313.0 in the dependencies group
dependabot[bot] [Wed, 17 Jun 2026 23:12:28 +0000 (23:12 +0000)]
Bump ruby/setup-ruby from 1.312.0 to 1.313.0 in the dependencies group

Bumps the dependencies group with 1 update: [ruby/setup-ruby](https://github.com/ruby/setup-ruby).

Updates `ruby/setup-ruby` from 1.312.0 to 1.313.0
- [Release notes](https://github.com/ruby/setup-ruby/releases)
- [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb)
- [Commits](https://github.com/ruby/setup-ruby/compare/12fd324f1d0b43274fdc8130f6980590a667c455...89f90524b88a01fe6e0b732220432cc6142926af)

---
updated-dependencies:
- dependency-name: ruby/setup-ruby
  dependency-version: 1.313.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
6 days agoMerge pull request #7159 from tyrasd/iD-2.41.0
Marwin Hochfelsner [Tue, 16 Jun 2026 21:51:49 +0000 (23:51 +0200)]
Merge pull request #7159 from tyrasd/iD-2.41.0

update iD to v2.41.0

8 days agoupdate iD to v2.41.0
Martin Raifer [Mon, 15 Jun 2026 18:37:20 +0000 (20:37 +0200)]
update iD to v2.41.0

8 days agoMerge pull request #7158 from openstreetmap/translatewiki
Marwin Hochfelsner [Mon, 15 Jun 2026 17:54:34 +0000 (19:54 +0200)]
Merge pull request #7158 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

8 days agoMerge pull request #7132 from pablobm/display-note-error
Marwin Hochfelsner [Mon, 15 Jun 2026 15:49:28 +0000 (17:49 +0200)]
Merge pull request #7132 from pablobm/display-note-error

Display error message if note creation fails

8 days agoDisplay error message if note creation fails
Pablo Brasero [Thu, 28 May 2026 16:18:56 +0000 (17:18 +0100)]
Display error message if note creation fails

Co-authored-by: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
8 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 Jun 2026 12:16:51 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

9 days agoSwitch from Versatiles Colorful to SVWD03
Paul Norman [Sun, 14 Jun 2026 20:08:33 +0000 (13:08 -0700)]
Switch from Versatiles Colorful to SVWD03

The SVWD03 style shows off more of what Shortbread has.

10 days agoMerge pull request #7154 from pablobm/no-trigger-happy-autolinks
Marwin Hochfelsner [Fri, 12 Jun 2026 22:21:31 +0000 (00:21 +0200)]
Merge pull request #7154 from pablobm/no-trigger-happy-autolinks

Avoid autolink patterns that trigger too easily

11 days agoAvoid autolink patterns that trigger too easily
Pablo Brasero [Thu, 11 Jun 2026 19:58:01 +0000 (20:58 +0100)]
Avoid autolink patterns that trigger too easily

12 days agoMerge remote-tracking branch 'upstream/pull/7153'
Tom Hughes [Thu, 11 Jun 2026 17:17:55 +0000 (18:17 +0100)]
Merge remote-tracking branch 'upstream/pull/7153'

12 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 11 Jun 2026 12:18:08 +0000 (14:18 +0200)]
Localisation updates from https://translatewiki.net.

12 days agoMerge remote-tracking branch 'upstream/pull/7152'
Tom Hughes [Wed, 10 Jun 2026 23:47:42 +0000 (00:47 +0100)]
Merge remote-tracking branch 'upstream/pull/7152'

12 days agoMerge remote-tracking branch 'upstream/pull/7149'
Tom Hughes [Wed, 10 Jun 2026 23:47:27 +0000 (00:47 +0100)]
Merge remote-tracking branch 'upstream/pull/7149'

12 days agoMerge pull request #7151 from openstreetmap/dependabot/npm_and_yarn/dependencies...
Marwin Hochfelsner [Wed, 10 Jun 2026 23:27:01 +0000 (01:27 +0200)]
Merge pull request #7151 from openstreetmap/dependabot/npm_and_yarn/dependencies-859d0a6eda

Bump @types/jquery from 4.0.0 to 4.0.1 in the dependencies group

12 days agoMerge pull request #7150 from openstreetmap/dependabot/bundler/rubocop-45d2eb50df
Marwin Hochfelsner [Wed, 10 Jun 2026 23:26:41 +0000 (01:26 +0200)]
Merge pull request #7150 from openstreetmap/dependabot/bundler/rubocop-45d2eb50df

Bump rubocop-rails from 2.35.3 to 2.35.4 in the rubocop group

12 days agoBump the dependencies group with 4 updates
dependabot[bot] [Wed, 10 Jun 2026 23:17:02 +0000 (23:17 +0000)]
Bump the dependencies group with 4 updates

Bumps the dependencies group with 4 updates: [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper), [doorkeeper-i18n](https://github.com/doorkeeper-gem/doorkeeper-i18n), [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) and [overcommit](https://github.com/sds/overcommit).

Updates `doorkeeper` from 5.9.1 to 5.9.2
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.9.1...v5.9.2)

Updates `doorkeeper-i18n` from 5.2.8 to 5.2.9
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper-i18n/releases)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper-i18n/commits/v5.2.9)

Updates `aws-sdk-s3` from 1.225.0 to 1.225.1
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Updates `overcommit` from 0.70.0 to 0.71.0
- [Release notes](https://github.com/sds/overcommit/releases)
- [Changelog](https://github.com/sds/overcommit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sds/overcommit/compare/v0.70.0...v0.71.0)

---
updated-dependencies:
- dependency-name: doorkeeper
  dependency-version: 5.9.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: doorkeeper-i18n
  dependency-version: 5.2.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.225.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: overcommit
  dependency-version: 0.71.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
12 days agoBump @types/jquery from 4.0.0 to 4.0.1 in the dependencies group
dependabot[bot] [Wed, 10 Jun 2026 23:13:14 +0000 (23:13 +0000)]
Bump @types/jquery from 4.0.0 to 4.0.1 in the dependencies group

Bumps the dependencies group with 1 update: [@types/jquery](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jquery).

Updates `@types/jquery` from 4.0.0 to 4.0.1
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jquery)

---
updated-dependencies:
- dependency-name: "@types/jquery"
  dependency-version: 4.0.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
12 days agoBump rubocop-rails from 2.35.3 to 2.35.4 in the rubocop group
dependabot[bot] [Wed, 10 Jun 2026 23:12:51 +0000 (23:12 +0000)]
Bump rubocop-rails from 2.35.3 to 2.35.4 in the rubocop group

Bumps the rubocop group with 1 update: [rubocop-rails](https://github.com/rubocop/rubocop-rails).

Updates `rubocop-rails` from 2.35.3 to 2.35.4
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.35.3...v2.35.4)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-version: 2.35.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: rubocop
...

Signed-off-by: dependabot[bot] <support@github.com>
12 days agoBump ruby/setup-ruby from 1.310.0 to 1.312.0 in the dependencies group
dependabot[bot] [Wed, 10 Jun 2026 23:12:41 +0000 (23:12 +0000)]
Bump ruby/setup-ruby from 1.310.0 to 1.312.0 in the dependencies group

Bumps the dependencies group with 1 update: [ruby/setup-ruby](https://github.com/ruby/setup-ruby).

Updates `ruby/setup-ruby` from 1.310.0 to 1.312.0
- [Release notes](https://github.com/ruby/setup-ruby/releases)
- [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb)
- [Commits](https://github.com/ruby/setup-ruby/compare/afeafc3d1ab54a631816aba4c914a0081c12ff2f...12fd324f1d0b43274fdc8130f6980590a667c455)

---
updated-dependencies:
- dependency-name: ruby/setup-ruby
  dependency-version: 1.312.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks agoMerge remote-tracking branch 'upstream/pull/7145'
Tom Hughes [Tue, 9 Jun 2026 18:57:07 +0000 (19:57 +0100)]
Merge remote-tracking branch 'upstream/pull/7145'

2 weeks agoBump net-imap from 0.6.4 to 0.6.4.1
dependabot[bot] [Tue, 9 Jun 2026 18:47:36 +0000 (18:47 +0000)]
Bump net-imap from 0.6.4 to 0.6.4.1

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.6.4 to 0.6.4.1.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.6.4...v0.6.4.1)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-version: 0.6.4.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks agoMerge remote-tracking branch 'upstream/pull/7138'
Tom Hughes [Tue, 9 Jun 2026 18:04:09 +0000 (19:04 +0100)]
Merge remote-tracking branch 'upstream/pull/7138'

2 weeks agoAdd query parameter that to suppress display of signup UI elements
Simon Poole [Sun, 7 Jun 2026 10:00:57 +0000 (10:00 +0000)]
Add query parameter that to suppress display of signup UI elements

This adds support for a query paramater "allow_signup" that will
suppress the rendering of signup UI elements during the OAuth2
authorisation flow.

This is the same solution as github implements for their "webflow"
OAuth2 process.

Resolves https://github.com/openstreetmap/openstreetmap-website/issues/5118

2 weeks agoMerge pull request #7144 from tomhughes/js-minimise
Andy Allan [Tue, 9 Jun 2026 16:30:09 +0000 (17:30 +0100)]
Merge pull request #7144 from tomhughes/js-minimise

Restore javascript minimisation in production

2 weeks agoRestore javascript minimisation in production
Tom Hughes [Tue, 9 Jun 2026 11:30:03 +0000 (12:30 +0100)]
Restore javascript minimisation in production

Fixes #7143.

2 weeks agoMerge pull request #7141 from openstreetmap/translatewiki
Marwin Hochfelsner [Mon, 8 Jun 2026 14:42:56 +0000 (16:42 +0200)]
Merge pull request #7141 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

2 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 8 Jun 2026 12:17:26 +0000 (14:17 +0200)]
Localisation updates from https://translatewiki.net.

2 weeks agoMerge remote-tracking branch 'upstream/pull/7131'
Tom Hughes [Thu, 4 Jun 2026 19:36:15 +0000 (20:36 +0100)]
Merge remote-tracking branch 'upstream/pull/7131'

2 weeks agoMerge pull request #7134 from tyrasd/iD-issue-10700
Marwin Hochfelsner [Thu, 4 Jun 2026 16:04:29 +0000 (18:04 +0200)]
Merge pull request #7134 from tyrasd/iD-issue-10700

[iD] fix glitchy zoom level caused by out-of-order event handlers

2 weeks agofix detection of automatic hash changes for out-of-order events
Martin Raifer [Thu, 4 Jun 2026 13:20:21 +0000 (15:20 +0200)]
fix detection of automatic hash changes for out-of-order events

see https://github.com/openstreetmap/iD/issues/10700#issuecomment-4615707609

Normally, the `onIframeHashChange` event is immediately followed by the respective `hashchange` event. But in some conditions (when the js main thread is busy with something else), it can happen that multiple `onIframeHashChange` events/messages are received right after each other, before the respective `hashchange` events are called.
The mechanism that detects wheter a hash change was "automatic" (set programmatically from inside the iframe by iD) relies on the order of events to function correctly.
This fixes the implementation by remembering which concrete hashchanges were triggered by the iframe message, avoiding duplicate/nop changes, and only updating the editor's map location if the hash change really did not come from the iD iframe itself.

fixes https://github.com/openstreetmap/iD/issues/10700

2 weeks agoMerge pull request #7133 from openstreetmap/translatewiki
Marwin Hochfelsner [Thu, 4 Jun 2026 13:12:43 +0000 (15:12 +0200)]
Merge pull request #7133 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

2 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 4 Jun 2026 12:15:41 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

2 weeks agoMerge pull request #7130 from openstreetmap/dependabot/npm_and_yarn/dependencies...
Marwin Hochfelsner [Thu, 4 Jun 2026 10:28:43 +0000 (12:28 +0200)]
Merge pull request #7130 from openstreetmap/dependabot/npm_and_yarn/dependencies-35c92e866e

Bump the dependencies group with 2 updates

2 weeks agoMerge pull request #7129 from openstreetmap/dependabot/bundler/rubocop-543235cdfe
Marwin Hochfelsner [Thu, 4 Jun 2026 10:27:52 +0000 (12:27 +0200)]
Merge pull request #7129 from openstreetmap/dependabot/bundler/rubocop-543235cdfe

Bump the rubocop group with 2 updates

2 weeks agoMerge pull request #7128 from openstreetmap/dependabot/github_actions/dependencies...
Marwin Hochfelsner [Thu, 4 Jun 2026 10:27:23 +0000 (12:27 +0200)]
Merge pull request #7128 from openstreetmap/dependabot/github_actions/dependencies-3a660dc918

Bump the dependencies group with 2 updates

2 weeks agoBump the dependencies group with 5 updates
dependabot[bot] [Thu, 4 Jun 2026 03:36:30 +0000 (03:36 +0000)]
Bump the dependencies group with 5 updates

Bumps the dependencies group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [bootsnap](https://github.com/rails/bootsnap) | `1.24.5` | `1.24.6` |
| [doorkeeper-openid_connect](https://github.com/doorkeeper-gem/doorkeeper-openid_connect) | `1.9.0` | `1.10.1` |
| [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) | `1.224.0` | `1.225.0` |
| [image_processing](https://github.com/janko/image_processing) | `2.0.1` | `2.0.2` |
| [overcommit](https://github.com/sds/overcommit) | `0.69.0` | `0.70.0` |

Updates `bootsnap` from 1.24.5 to 1.24.6
- [Release notes](https://github.com/rails/bootsnap/releases)
- [Changelog](https://github.com/rails/bootsnap/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rails/bootsnap/compare/v1.24.5...v1.24.6)

Updates `doorkeeper-openid_connect` from 1.9.0 to 1.10.1
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/compare/v1.9.0...v1.10.1)

Updates `aws-sdk-s3` from 1.224.0 to 1.225.0
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Updates `image_processing` from 2.0.1 to 2.0.2
- [Changelog](https://github.com/janko/image_processing/blob/master/CHANGELOG.md)
- [Commits](https://github.com/janko/image_processing/compare/v2.0.1...v2.0.2)

Updates `overcommit` from 0.69.0 to 0.70.0
- [Release notes](https://github.com/sds/overcommit/releases)
- [Changelog](https://github.com/sds/overcommit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sds/overcommit/compare/v0.69.0...v0.70.0)

---
updated-dependencies:
- dependency-name: bootsnap
  dependency-version: 1.24.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: doorkeeper-openid_connect
  dependency-version: 1.10.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.225.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: image_processing
  dependency-version: 2.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: overcommit
  dependency-version: 0.70.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks agoBump the dependencies group with 2 updates
dependabot[bot] [Thu, 4 Jun 2026 03:32:43 +0000 (03:32 +0000)]
Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [js-cookie](https://github.com/js-cookie/js-cookie) and [eslint](https://github.com/eslint/eslint).

Updates `js-cookie` from 3.0.7 to 3.0.8
- [Release notes](https://github.com/js-cookie/js-cookie/releases)
- [Commits](https://github.com/js-cookie/js-cookie/compare/v3.0.7...v3.0.8)

Updates `eslint` from 10.4.0 to 10.4.1
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v10.4.0...v10.4.1)

---
updated-dependencies:
- dependency-name: js-cookie
  dependency-version: 3.0.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: eslint
  dependency-version: 10.4.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks agoBump the rubocop group with 2 updates
dependabot[bot] [Thu, 4 Jun 2026 03:32:36 +0000 (03:32 +0000)]
Bump the rubocop group with 2 updates

Bumps the rubocop group with 2 updates: [rubocop](https://github.com/rubocop/rubocop) and [rubocop-rails](https://github.com/rubocop/rubocop-rails).

Updates `rubocop` from 1.86.2 to 1.87.0
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.86.2...v1.87.0)

Updates `rubocop-rails` from 2.35.2 to 2.35.3
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.35.2...v2.35.3)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-version: 1.87.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: rubocop
- dependency-name: rubocop-rails
  dependency-version: 2.35.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: rubocop
...

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks agoBump the dependencies group with 2 updates
dependabot[bot] [Thu, 4 Jun 2026 03:32:07 +0000 (03:32 +0000)]
Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [devcontainers/ci](https://github.com/devcontainers/ci).

Updates `actions/checkout` from 6.0.2 to 6.0.3
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/de0fac2e4500dabe0009e67214ff5f5447ce83dd...df4cb1c069e1874edd31b4311f1884172cec0e10)

Updates `devcontainers/ci` from 0.3.1900000449 to 0.3.1900000450
- [Release notes](https://github.com/devcontainers/ci/releases)
- [Commits](https://github.com/devcontainers/ci/compare/b63b30de439b47a52267f241112c5b453b673db5...513af61f4de4f75d37e4438f184ba4358f0fc1ca)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: devcontainers/ci
  dependency-version: 0.3.1900000450
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
3 weeks agoMerge pull request #7121 from openstreetmap/translatewiki
Marwin Hochfelsner [Mon, 1 Jun 2026 20:43:01 +0000 (22:43 +0200)]
Merge pull request #7121 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

3 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 1 Jun 2026 12:26:09 +0000 (14:26 +0200)]
Localisation updates from https://translatewiki.net.

3 weeks agoAllow turnstile for users#create as well as users#new
Tom Hughes [Sun, 31 May 2026 09:44:36 +0000 (10:44 +0100)]
Allow turnstile for users#create as well as users#new

3 weeks agoDrop custom image_optim gem
Tom Hughes [Thu, 28 May 2026 16:50:39 +0000 (17:50 +0100)]
Drop custom image_optim gem

The upstream fix has now been released so we no longer need this.

3 weeks agoMerge remote-tracking branch 'upstream/pull/7114'
Tom Hughes [Thu, 28 May 2026 16:47:15 +0000 (17:47 +0100)]
Merge remote-tracking branch 'upstream/pull/7114'

3 weeks agoMerge pull request #7113 from openstreetmap/dependabot/npm_and_yarn/dependencies...
Marwin Hochfelsner [Thu, 28 May 2026 14:41:31 +0000 (16:41 +0200)]
Merge pull request #7113 from openstreetmap/dependabot/npm_and_yarn/dependencies-4387151758

Bump tag2link from 2026.5.6 to 2026.5.21 in the dependencies group

3 weeks agoMerge pull request #7115 from openstreetmap/translatewiki
Marwin Hochfelsner [Thu, 28 May 2026 14:36:47 +0000 (16:36 +0200)]
Merge pull request #7115 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

3 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 28 May 2026 12:14:06 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.

3 weeks agoBump the dependencies group with 10 updates
dependabot[bot] [Thu, 28 May 2026 00:17:25 +0000 (00:17 +0000)]
Bump the dependencies group with 10 updates

Bumps the dependencies group with 10 updates:

| Package | From | To |
| --- | --- | --- |
| [jbuilder](https://github.com/rails/jbuilder) | `2.15.0` | `2.15.1` |
| [bootsnap](https://github.com/rails/bootsnap) | `1.24.4` | `1.24.5` |
| [image_optim](https://github.com/tomhughes/image_optim) | ``745137c`` | ``1a88763`` |
| [dalli](https://github.com/petergoldstein/dalli) | `5.0.4` | `5.0.5` |
| [opentelemetry-instrumentation-all](https://github.com/open-telemetry/opentelemetry-ruby-contrib) | `0.93.0` | `0.94.0` |
| [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) | `1.223.0` | `1.224.0` |
| [image_processing](https://github.com/janko/image_processing) | `2.0.0` | `2.0.1` |
| [jwt](https://github.com/jwt/ruby-jwt) | `2.10.2` | `2.10.3` |
| [puma](https://github.com/puma/puma) | `8.0.1` | `8.0.2` |
| [database_consistency](https://github.com/djezzzl/database_consistency) | `3.0.4` | `3.0.5` |

Updates `jbuilder` from 2.15.0 to 2.15.1
- [Release notes](https://github.com/rails/jbuilder/releases)
- [Commits](https://github.com/rails/jbuilder/compare/v2.15.0...v2.15.1)

Updates `bootsnap` from 1.24.4 to 1.24.5
- [Release notes](https://github.com/rails/bootsnap/releases)
- [Changelog](https://github.com/rails/bootsnap/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rails/bootsnap/compare/v1.24.4...v1.24.5)

Updates `image_optim` from `745137c` to `1a88763`
- [Commits](https://github.com/tomhughes/image_optim/compare/745137caf615ab07b29082c291416c8fbe0ac3b9...1a887639492923d05256d60c063e357c93d648d8)

Updates `dalli` from 5.0.4 to 5.0.5
- [Changelog](https://github.com/petergoldstein/dalli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v5.0.4...v5.0.5)

Updates `opentelemetry-instrumentation-all` from 0.93.0 to 0.94.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby-contrib/releases)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby-contrib/compare/opentelemetry-instrumentation-all/v0.93.0...opentelemetry-instrumentation-all/v0.94.0)

Updates `aws-sdk-s3` from 1.223.0 to 1.224.0
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Updates `image_processing` from 2.0.0 to 2.0.1
- [Changelog](https://github.com/janko/image_processing/blob/master/CHANGELOG.md)
- [Commits](https://github.com/janko/image_processing/compare/v2.0.0...v2.0.1)

Updates `jwt` from 2.10.2 to 2.10.3
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.10.2...v2.10.3)

Updates `puma` from 8.0.1 to 8.0.2
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/main/History.md)
- [Commits](https://github.com/puma/puma/compare/v8.0.1...v8.0.2)

Updates `database_consistency` from 3.0.4 to 3.0.5
- [Changelog](https://github.com/djezzzl/database_consistency/blob/master/CHANGELOG.md)
- [Commits](https://github.com/djezzzl/database_consistency/compare/v3.0.4...v3.0.5)

---
updated-dependencies:
- dependency-name: jbuilder
  dependency-version: 2.15.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: bootsnap
  dependency-version: 1.24.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: image_optim
  dependency-version: 1a887639492923d05256d60c063e357c93d648d8
  dependency-type: direct:production
  dependency-group: dependencies
- dependency-name: dalli
  dependency-version: 5.0.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: opentelemetry-instrumentation-all
  dependency-version: 0.94.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.224.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: image_processing
  dependency-version: 2.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: jwt
  dependency-version: 2.10.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: puma
  dependency-version: 8.0.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: database_consistency
  dependency-version: 3.0.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
3 weeks agoBump tag2link from 2026.5.6 to 2026.5.21 in the dependencies group
dependabot[bot] [Thu, 28 May 2026 00:13:09 +0000 (00:13 +0000)]
Bump tag2link from 2026.5.6 to 2026.5.21 in the dependencies group

Bumps the dependencies group with 1 update: [tag2link](https://github.com/JOSM/tag2link).

Updates `tag2link` from 2026.5.6 to 2026.5.21
- [Release notes](https://github.com/JOSM/tag2link/releases)
- [Commits](https://github.com/JOSM/tag2link/compare/2026.5.6...2026.5.21)

---
updated-dependencies:
- dependency-name: tag2link
  dependency-version: 2026.5.21
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
4 weeks agoMerge remote-tracking branch 'upstream/pull/7110'
Tom Hughes [Mon, 25 May 2026 17:42:26 +0000 (18:42 +0100)]
Merge remote-tracking branch 'upstream/pull/7110'

4 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 May 2026 12:15:42 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

4 weeks agoMerge remote-tracking branch 'upstream/pull/7109'
Tom Hughes [Sun, 24 May 2026 17:39:15 +0000 (18:39 +0100)]
Merge remote-tracking branch 'upstream/pull/7109'

4 weeks agoAdd banner configuration for State of the Map Colombia 2026
Andres Gomez Casanova [Fri, 22 May 2026 19:58:52 +0000 (14:58 -0500)]
Add banner configuration for State of the Map Colombia 2026

4 weeks agoBanner images for SotMCol26
Andres Gomez Casanova [Fri, 22 May 2026 19:54:33 +0000 (14:54 -0500)]
Banner images for SotMCol26

4 weeks agoMerge remote-tracking branch 'upstream/pull/7108'
Tom Hughes [Fri, 22 May 2026 18:13:16 +0000 (19:13 +0100)]
Merge remote-tracking branch 'upstream/pull/7108'

4 weeks agoAdd more wiki prefixes
Marwin Hochfelsner [Fri, 22 May 2026 15:43:40 +0000 (17:43 +0200)]
Add more wiki prefixes

4 weeks agoMerge remote-tracking branch 'upstream/pull/7106'
Tom Hughes [Fri, 22 May 2026 06:58:55 +0000 (07:58 +0100)]
Merge remote-tracking branch 'upstream/pull/7106'

4 weeks agoFix crash due to cgi gem not fully loaded
Pablo Brasero [Fri, 22 May 2026 04:54:49 +0000 (05:54 +0100)]
Fix crash due to cgi gem not fully loaded

4 weeks agoMerge pull request #7103 from openstreetmap/translatewiki
Marwin Hochfelsner [Thu, 21 May 2026 18:29:11 +0000 (20:29 +0200)]
Merge pull request #7103 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

4 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 21 May 2026 12:13:11 +0000 (14:13 +0200)]
Localisation updates from https://translatewiki.net.

4 weeks agoInstall libvips-dev for workflows that load the bundle
Tom Hughes [Thu, 21 May 2026 07:42:41 +0000 (08:42 +0100)]
Install libvips-dev for workflows that load the bundle

4 weeks agoRequire ruby-vips explicitly
Tom Hughes [Thu, 21 May 2026 07:29:06 +0000 (08:29 +0100)]
Require ruby-vips explicitly

As of 2.x the image_processing no longer requires it automatically.

4 weeks agoUpdate test for change in message from third party gem
Tom Hughes [Thu, 21 May 2026 07:25:42 +0000 (08:25 +0100)]
Update test for change in message from third party gem

4 weeks agoMerge remote-tracking branch 'upstream/pull/7102'
Tom Hughes [Thu, 21 May 2026 07:01:52 +0000 (08:01 +0100)]
Merge remote-tracking branch 'upstream/pull/7102'

4 weeks agoMerge remote-tracking branch 'upstream/pull/7101'
Tom Hughes [Thu, 21 May 2026 07:01:36 +0000 (08:01 +0100)]
Merge remote-tracking branch 'upstream/pull/7101'