Merge remote-tracking branch 'upstream/pull/7391'

Merge remote-tracking branch 'upstream/pull/7395'

Merge pull request #7393 from openstreetmap/dependabot/bundler/rubocop-70ebabdb35

Bump rubocop from 1.90.0 to 1.91.0 in the rubocop group

Merge pull request #7394 from openstreetmap/dependabot/npm_and_yarn/dependencies-45d869f03e

Bump @herb-tools/linter from 0.10.3 to 0.10.4 in the dependencies group

Merge pull request #7396 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Bump the dependencies group with 19 updates

Bumps the dependencies group with 19 updates:

| Package | From | To |
| --- | --- | --- |
| [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) | `5.9.6` | `5.9.7` |
| [opentelemetry-exporter-otlp](https://github.com/open-telemetry/opentelemetry-ruby) | `0.35.1` | `0.36.0` |
| [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) | `1.229.0` | `1.232.0` |
| [herb](https://github.com/marcoroth/herb) | `0.10.3` | `0.10.4` |
| [selenium-webdriver](https://github.com/SeleniumHQ/selenium) | `4.48.0` | `4.49.0` |
| [simplecov](https://github.com/simplecov-ruby/simplecov) | `1.2.0` | `1.3.0` |
| [aws-partitions](https://github.com/aws/aws-sdk-ruby) | `1.1284.0` | `1.1287.0` |
| [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) | `3.254.1` | `3.257.0` |
| [aws-sdk-kms](https://github.com/aws/aws-sdk-ruby) | `1.130.0` | `1.132.0` |
| [bigdecimal](https://github.com/ruby/bigdecimal) | `4.1.2` | `4.1.3` |
| [git](https://github.com/ruby-git/ruby-git) | `5.4.1` | `5.6.0` |
| [io-console](https://github.com/ruby/io-console) | `0.9.2` | `0.9.3` |
| [msgpack](https://github.com/msgpack/msgpack-ruby) | `1.8.4` | `1.8.5` |
| [net-imap](https://github.com/ruby/net-imap) | `0.6.6` | `0.6.7` |
| [opentelemetry-api](https://github.com/open-telemetry/opentelemetry-ruby) | `1.11.0` | `1.11.1` |
| [opentelemetry-instrumentation-grpc](https://github.com/open-telemetry/opentelemetry-ruby-contrib) | `0.5.2` | `0.5.3` |
| [opentelemetry-instrumentation-gruf](https://github.com/open-telemetry/opentelemetry-ruby-contrib) | `0.6.2` | `0.6.3` |
| [opentelemetry-instrumentation-http_client](https://github.com/open-telemetry/opentelemetry-ruby-contrib) | `0.29.0` | `0.29.1` |
| [opentelemetry-instrumentation-lmdb](https://github.com/open-telemetry/opentelemetry-ruby-contrib) | `0.26.0` | `0.26.1` |

Updates `doorkeeper` from 5.9.6 to 5.9.7
- [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.6...v5.9.7)

Updates `opentelemetry-exporter-otlp` from 0.35.1 to 0.36.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby/releases)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby/compare/opentelemetry-exporter-otlp/v0.35.1...opentelemetry-exporter-otlp/v0.36.0)

Updates `aws-sdk-s3` from 1.229.0 to 1.232.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 `herb` from 0.10.3 to 0.10.4
- [Release notes](https://github.com/marcoroth/herb/releases)
- [Commits](https://github.com/marcoroth/herb/compare/v0.10.3...v0.10.4)

Updates `selenium-webdriver` from 4.48.0 to 4.49.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.48.0...selenium-4.49.0)

Updates `simplecov` from 1.2.0 to 1.3.0
- [Release notes](https://github.com/simplecov-ruby/simplecov/releases)
- [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md)
- [Commits](https://github.com/simplecov-ruby/simplecov/compare/v1.2.0...v1.3.0)

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

Updates `aws-sdk-core` from 3.254.1 to 3.257.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-core/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Updates `aws-sdk-kms` from 1.130.0 to 1.132.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-kms/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Updates `bigdecimal` from 4.1.2 to 4.1.3
- [Release notes](https://github.com/ruby/bigdecimal/releases)
- [Changelog](https://github.com/ruby/bigdecimal/blob/master/CHANGES.md)
- [Commits](https://github.com/ruby/bigdecimal/compare/v4.1.2...v4.1.3)

Updates `git` from 5.4.1 to 5.6.0
- [Release notes](https://github.com/ruby-git/ruby-git/releases)
- [Changelog](https://github.com/ruby-git/ruby-git/blob/v5.6.0/CHANGELOG.md)
- [Commits](https://github.com/ruby-git/ruby-git/compare/v5.4.1...v5.6.0)

Updates `io-console` from 0.9.2 to 0.9.3
- [Release notes](https://github.com/ruby/io-console/releases)
- [Commits](https://github.com/ruby/io-console/compare/v0.9.2...v0.9.3)

Updates `msgpack` from 1.8.4 to 1.8.5
- [Changelog](https://github.com/msgpack/msgpack-ruby/blob/master/ChangeLog)
- [Commits](https://github.com/msgpack/msgpack-ruby/compare/v1.8.4...v1.8.5)

Updates `net-imap` from 0.6.6 to 0.6.7
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.6.6...v0.6.7)

Updates `opentelemetry-api` from 1.11.0 to 1.11.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby/releases)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby/compare/opentelemetry-api/v1.11.0...opentelemetry-api/v1.11.1)

Updates `opentelemetry-instrumentation-grpc` from 0.5.2 to 0.5.3
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby-contrib/releases)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby-contrib/compare/opentelemetry-instrumentation-grpc/v0.5.2...opentelemetry-instrumentation-grpc/v0.5.3)

Updates `opentelemetry-instrumentation-gruf` from 0.6.2 to 0.6.3
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby-contrib/releases)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby-contrib/compare/opentelemetry-instrumentation-gruf/v0.6.2...opentelemetry-instrumentation-gruf/v0.6.3)

Updates `opentelemetry-instrumentation-http_client` from 0.29.0 to 0.29.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby-contrib/releases)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby-contrib/compare/opentelemetry-instrumentation-http_client/v0.29.0...opentelemetry-instrumentation-http_client/v0.29.1)

Updates `opentelemetry-instrumentation-lmdb` from 0.26.0 to 0.26.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby-contrib/releases)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby-contrib/compare/opentelemetry-instrumentation-lmdb/v0.26.0...opentelemetry-instrumentation-lmdb/v0.26.1)

---
updated-dependencies:
- dependency-name: doorkeeper
  dependency-version: 5.9.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: opentelemetry-exporter-otlp
  dependency-version: 0.36.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.232.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: herb
  dependency-version: 0.10.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: selenium-webdriver
  dependency-version: 4.49.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: simplecov
  dependency-version: 1.3.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: aws-partitions
  dependency-version: 1.1287.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: aws-sdk-core
  dependency-version: 3.257.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: aws-sdk-kms
  dependency-version: 1.132.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: bigdecimal
  dependency-version: 4.1.3
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: git
  dependency-version: 5.6.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: io-console
  dependency-version: 0.9.3
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: msgpack
  dependency-version: 1.8.5
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: net-imap
  dependency-version: 0.6.7
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: opentelemetry-api
  dependency-version: 1.11.1
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: opentelemetry-instrumentation-grpc
  dependency-version: 0.5.3
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: opentelemetry-instrumentation-gruf
  dependency-version: 0.6.3
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: opentelemetry-instrumentation-http_client
  dependency-version: 0.29.1
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: opentelemetry-instrumentation-lmdb
  dependency-version: 0.26.1
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump @herb-tools/linter from 0.10.3 to 0.10.4 in the dependencies group

Bumps the dependencies group with 1 update: [@herb-tools/linter](https://github.com/marcoroth/herb/tree/HEAD/javascript/packages/linter).

Updates `@herb-tools/linter` from 0.10.3 to 0.10.4
- [Release notes](https://github.com/marcoroth/herb/releases)
- [Commits](https://github.com/marcoroth/herb/commits/v0.10.4/javascript/packages/linter)

---
updated-dependencies:
- dependency-name: "@herb-tools/linter"
  dependency-version: 0.10.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump rubocop from 1.90.0 to 1.91.0 in the rubocop group

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

Updates `rubocop` from 1.90.0 to 1.91.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.90.0...v1.91.0)

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

Signed-off-by: dependabot[bot] <support@github.com>

Add trailing slashes to directories in robots.txt

The standard specifies that /path/ matches anything
under it, but does not specify /path as matching
anything other than exactly it.

Merge remote-tracking branch 'upstream/pull/7349'

Merge remote-tracking branch 'upstream/pull/7351'

Merge pull request #7382 from tomhughes/no-links

Fix some exceptions in user profile updates

Fix home location reload refresh

Test submitting no change to a user image

Make profiles/images#update handle being given no image

Drop unused description parameter

Make profiles/links#update handle being given no links

Merge pull request #7373 from kmpoppe/note-moderation-zone-message

Make Moderation Zone Note Error more user friendly

Merge pull request #7372 from tomhughes/bogus-browse-redirect

Ignore invalid object IDs in various redirects

Merge pull request #7385 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/7364'

Generalize API response

The API http-header response for a moderation zone now encourages to sign in or sign up

Make Moderation Zone Note Error more user friendly

Resolves #7276.
API sends a more explicit message than 403 already, this is now displayed.

Change "New Note" information texts and placements

Resolves #2415 with updating the textarea placeholder for quality-note encouragements and adding a warning about publicity of notes.

Co-Authored-By: Minh Nguyễn <mxn@1ec5.org>
Co-Authored-By: Pablo Brasero <36066+pablobm@users.noreply.github.com>
Co-Authored-By: Tom Hughes <147741+tomhughes@users.noreply.github.com>

Merge remote-tracking branch 'upstream/pull/7375'

Merge remote-tracking branch 'upstream/pull/7381'

Add ACL cursor-base pagination

Create a UI for managing ACLs

This allows administrators to manage ACLs, without having to either
use the console or use the postgresql cli.

Merge remote-tracking branch 'upstream/pull/7368'

Bump the dependencies group with 18 updates

Bumps the dependencies group with 18 updates:

| Package | From | To |
| --- | --- | --- |
| [aws-partitions](https://github.com/aws/aws-sdk-ruby) | `1.1280.0` | `1.1284.0` |
| [bindata](https://github.com/dmendel/bindata) | `2.5.1` | `3.0.0` |
| [dry-configurable](https://github.com/dry-rb/dry-configurable) | `1.3.0` | `1.4.0` |
| [execjs](https://github.com/rails/execjs) | `2.10.1` | `2.10.2` |
| [factory_bot](https://github.com/thoughtbot/factory_bot) | `6.5.6` | `6.6.0` |
| [ffi-compiler](https://github.com/ffi/ffi-compiler) | `1.3.2` | `1.4.2` |
| [git](https://github.com/ruby-git/ruby-git) | `5.0.0` | `5.4.1` |
| [glob](https://github.com/fnando/glob) | `0.4.1` | `0.5.0` |
| [json-jwt](https://github.com/nov/json-jwt) | `1.17.0` | `1.17.2` |
| [mini_racer](https://github.com/discourse/mini_racer) | `0.21.0` | `0.22.1` |
| [net-protocol](https://github.com/ruby/net-protocol) | `0.2.2` | `0.3.0` |
| [oauth](https://github.com/ruby-oauth/oauth) | `1.1.6` | `1.1.8` |
| [parallel](https://github.com/grosser/parallel) | `2.1.0` | `2.2.0` |
| [process_executer](https://github.com/main-branch/process_executer) | `4.0.4` | `4.1.1` |
| [rbs](https://github.com/ruby/rbs) | `4.1.3` | `4.2.0` |
| [rouge](https://github.com/rouge-ruby/rouge) | `4.7.0` | `5.1.0` |
| [simpleidn](https://github.com/mmriis/simpleidn) | `0.2.3` | `0.3.0` |
| [tilt](https://github.com/jeremyevans/tilt) | `2.7.0` | `2.9.0` |

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

Updates `bindata` from 2.5.1 to 3.0.0
- [Changelog](https://github.com/dmendel/bindata/blob/master/ChangeLog.rdoc)
- [Commits](https://github.com/dmendel/bindata/compare/v2.5.1...v3.0.0)

Updates `dry-configurable` from 1.3.0 to 1.4.0
- [Release notes](https://github.com/dry-rb/dry-configurable/releases)
- [Changelog](https://github.com/dry-rb/dry-configurable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/dry-rb/dry-configurable/compare/v1.3.0...v1.4.0)

Updates `execjs` from 2.10.1 to 2.10.2
- [Release notes](https://github.com/rails/execjs/releases)
- [Commits](https://github.com/rails/execjs/compare/v2.10.1...v2.10.2)

Updates `factory_bot` from 6.5.6 to 6.6.0
- [Release notes](https://github.com/thoughtbot/factory_bot/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot/blob/main/NEWS.md)
- [Commits](https://github.com/thoughtbot/factory_bot/compare/v6.5.6...v6.6.0)

Updates `ffi-compiler` from 1.3.2 to 1.4.2
- [Release notes](https://github.com/ffi/ffi-compiler/releases)
- [Commits](https://github.com/ffi/ffi-compiler/compare/1.3.2...1.4.2)

Updates `git` from 5.0.0 to 5.4.1
- [Release notes](https://github.com/ruby-git/ruby-git/releases)
- [Changelog](https://github.com/ruby-git/ruby-git/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ruby-git/ruby-git/compare/v5.0.0...v5.4.1)

Updates `glob` from 0.4.1 to 0.5.0
- [Changelog](https://github.com/fnando/glob/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fnando/glob/compare/v0.4.1...v0.5.0)

Updates `json-jwt` from 1.17.0 to 1.17.2
- [Release notes](https://github.com/nov/json-jwt/releases)
- [Changelog](https://github.com/nov/json-jwt/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nov/json-jwt/compare/v1.17.0...v1.17.2)

Updates `mini_racer` from 0.21.0 to 0.22.1
- [Changelog](https://github.com/rubyjs/mini_racer/blob/main/CHANGELOG)
- [Commits](https://github.com/discourse/mini_racer/compare/v0.21.0...v0.22.1)

Updates `net-protocol` from 0.2.2 to 0.3.0
- [Release notes](https://github.com/ruby/net-protocol/releases)
- [Commits](https://github.com/ruby/net-protocol/compare/v0.2.2...v0.3.0)

Updates `oauth` from 1.1.6 to 1.1.8
- [Release notes](https://github.com/ruby-oauth/oauth/releases)
- [Changelog](https://github.com/ruby-oauth/oauth/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ruby-oauth/oauth/compare/v1.1.6...v1.1.8)

Updates `parallel` from 2.1.0 to 2.2.0
- [Changelog](https://github.com/grosser/parallel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/grosser/parallel/compare/v2.1.0...v2.2.0)

Updates `process_executer` from 4.0.4 to 4.1.1
- [Release notes](https://github.com/main-branch/process_executer/releases)
- [Changelog](https://github.com/main-branch/process_executer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/main-branch/process_executer/compare/v4.0.4...v4.1.1)

Updates `rbs` from 4.1.3 to 4.2.0
- [Release notes](https://github.com/ruby/rbs/releases)
- [Changelog](https://github.com/ruby/rbs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ruby/rbs/compare/v4.1.3...v4.2.0)

Updates `rouge` from 4.7.0 to 5.1.0
- [Release notes](https://github.com/rouge-ruby/rouge/releases)
- [Changelog](https://github.com/rouge-ruby/rouge/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rouge-ruby/rouge/compare/v4.7.0...v5.1.0)

Updates `simpleidn` from 0.2.3 to 0.3.0
- [Changelog](https://github.com/mmriis/simpleidn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mmriis/simpleidn/commits/v0.3.0)

Updates `tilt` from 2.7.0 to 2.9.0
- [Changelog](https://github.com/jeremyevans/tilt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jeremyevans/tilt/compare/v2.7.0...v2.9.0)

---
updated-dependencies:
- dependency-name: aws-partitions
  dependency-version: 1.1284.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: bindata
  dependency-version: 3.0.0
  dependency-type: indirect
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: dry-configurable
  dependency-version: 1.4.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: execjs
  dependency-version: 2.10.2
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: factory_bot
  dependency-version: 6.6.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: ffi-compiler
  dependency-version: 1.4.2
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: git
  dependency-version: 5.4.1
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: glob
  dependency-version: 0.5.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: json-jwt
  dependency-version: 1.17.2
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: mini_racer
  dependency-version: 0.22.1
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: net-protocol
  dependency-version: 0.3.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: oauth
  dependency-version: 1.1.8
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: parallel
  dependency-version: 2.2.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: process_executer
  dependency-version: 4.1.1
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: rbs
  dependency-version: 4.2.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: rouge
  dependency-version: 5.1.0
  dependency-type: indirect
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: simpleidn
  dependency-version: 0.3.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: tilt
  dependency-version: 2.9.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge remote-tracking branch 'upstream/pull/7374'

Merge remote-tracking branch 'upstream/pull/7369'

Merge remote-tracking branch 'upstream/pull/7378'

Merge remote-tracking branch 'upstream/pull/7380'

Update pinning reason

Update sprockets

Configure dependabot to update all dependencies

Previously, dependabot would only update gems mentioned in the gemfile,
and any dependencies of updated gems. This means that if the top-level
gem doesn't change, none of its dependencies were candidates.

So for a wrapper gem (like `dartsass-sprockets`) that doesn't need to
change often, the underlying dependencies (like `sprockets`) were often
becoming out-of-date.

Merge pull request #7379 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Change open note pin

Resolves #2882 with changing the open note pin from an "X" to an "!".

Fix flaky EmbedTest

*_embed_test failed intermittently, only in GH actions, not locally

Merge remote-tracking branch 'upstream/pull/7377'

Bump the dependencies group across 1 directory with 7 updates

Bumps the dependencies group with 7 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [activerecord-postgis](https://github.com/seuros/activerecord-postgis) | `0.5.1` | `0.6.0` |
| [bootsnap](https://github.com/rails/bootsnap) | `1.25.0` | `1.26.0` |
| [omniauth-google-oauth2](https://github.com/zquestz/omniauth-google-oauth2) | `1.2.2` | `1.2.3` |
| [opentelemetry-exporter-otlp](https://github.com/open-telemetry/opentelemetry-ruby) | `0.34.1` | `0.35.1` |
| [image_processing](https://github.com/janko/image_processing) | `2.0.3` | `2.1.0` |
| [overcommit](https://github.com/sds/overcommit) | `0.72.0` | `0.73.0` |
| [simplecov](https://github.com/simplecov-ruby/simplecov) | `1.1.1` | `1.2.0` |

Updates `activerecord-postgis` from 0.5.1 to 0.6.0
- [Release notes](https://github.com/seuros/activerecord-postgis/releases)
- [Changelog](https://github.com/seuros/activerecord-postgis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seuros/activerecord-postgis/compare/activerecord-postgis/v0.5.1...activerecord-postgis/v0.6.0)

Updates `bootsnap` from 1.25.0 to 1.26.0
- [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.25.0...v1.26.0)

Updates `omniauth-google-oauth2` from 1.2.2 to 1.2.3
- [Release notes](https://github.com/zquestz/omniauth-google-oauth2/releases)
- [Changelog](https://github.com/zquestz/omniauth-google-oauth2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zquestz/omniauth-google-oauth2/compare/v1.2.2...v1.2.3)

Updates `opentelemetry-exporter-otlp` from 0.34.1 to 0.35.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby/releases)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby/compare/opentelemetry-exporter-otlp/v0.34.1...opentelemetry-exporter-otlp/v0.35.1)

Updates `image_processing` from 2.0.3 to 2.1.0
- [Changelog](https://github.com/janko/image_processing/blob/master/CHANGELOG.md)
- [Commits](https://github.com/janko/image_processing/compare/v2.0.3...v2.1.0)

Updates `overcommit` from 0.72.0 to 0.73.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.72.0...v0.73.0)

Updates `simplecov` from 1.1.1 to 1.2.0
- [Release notes](https://github.com/simplecov-ruby/simplecov/releases)
- [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md)
- [Commits](https://github.com/simplecov-ruby/simplecov/compare/v1.1.1...v1.2.0)

---
updated-dependencies:
- dependency-name: activerecord-postgis
  dependency-version: 0.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: bootsnap
  dependency-version: 1.26.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: image_processing
  dependency-version: 2.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: omniauth-google-oauth2
  dependency-version: 1.2.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: opentelemetry-exporter-otlp
  dependency-version: 0.35.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: overcommit
  dependency-version: 0.73.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: simplecov
  dependency-version: 1.2.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Block json 3.x as sprockets does not support it yet

https://github.com/rails/sprockets/pull/829

Merge remote-tracking branch 'upstream/pull/7376'

Bump the dependencies group with 3 updates

Bumps the dependencies group with 3 updates: [terra-draw](https://github.com/JamesLMilner/terra-draw), [eslint](https://github.com/eslint/eslint) and [globals](https://github.com/sindresorhus/globals).

Updates `terra-draw` from 1.32.3 to 1.33.0
- [Release notes](https://github.com/JamesLMilner/terra-draw/releases)
- [Changelog](https://github.com/JamesLMilner/terra-draw/blob/main/release.js)
- [Commits](https://github.com/JamesLMilner/terra-draw/compare/terra-draw@1.32.3...terra-draw@1.33.0)

Updates `eslint` from 10.9.1 to 10.10.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v10.9.1...v10.10.0)

Updates `globals` from 17.11.0 to 17.12.0
- [Release notes](https://github.com/sindresorhus/globals/releases)
- [Commits](https://github.com/sindresorhus/globals/compare/v17.11.0...v17.12.0)

---
updated-dependencies:
- dependency-name: terra-draw
  dependency-version: 1.33.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: eslint
  dependency-version: 10.10.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: globals
  dependency-version: 17.12.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Ignore invalid object IDs in various redirects

Remove Anton from the maintainers list

He's currently on an extended break from the project, but he's welcome
back again in the future.

Link to the legacy traces page from the trace list

Add a page to change the visibility of legacy traces

Allow the traces page partial to be rendered from other controllers

Merge remote-tracking branch 'upstream/pull/7371'

Merge remote-tracking branch 'upstream/pull/7370'

Fix double load of the language selector

Resolves intermittent SelectLanguageTest errors

Drain pending browser/app requests in tests

Resolves intermittent WebMock::NetConnectNotAllowedError in system tests.

Merge pull request #7363 from tomhughes/sentry

Add support for sentry error logging

Merge pull request #7366 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Add support for sentry error logging

Merge pull request #7358 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/7357'

Merge remote-tracking branch 'upstream/pull/7356'

Fix new rubocop warnings

Merge remote-tracking branch 'upstream/pull/7355'

Bump the dependencies group with 3 updates

Bumps the dependencies group with 3 updates: [selenium-webdriver](https://github.com/SeleniumHQ/selenium), [webmock](https://github.com/bblimke/webmock) and [database_consistency](https://github.com/djezzzl/database_consistency).

Updates `selenium-webdriver` from 4.47.0 to 4.48.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.47.0...selenium-4.48.0)

Updates `webmock` from 3.26.3 to 3.26.4
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.26.3...v3.26.4)

Updates `database_consistency` from 3.0.10 to 3.0.11
- [Changelog](https://github.com/djezzzl/database_consistency/blob/master/CHANGELOG.md)
- [Commits](https://github.com/djezzzl/database_consistency/compare/v3.0.10...v3.0.11)

---
updated-dependencies:
- dependency-name: selenium-webdriver
  dependency-version: 4.48.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: webmock
  dependency-version: 3.26.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: database_consistency
  dependency-version: 3.0.11
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump eslint from 10.9.0 to 10.9.1 in the dependencies group

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

Updates `eslint` from 10.9.0 to 10.9.1
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v10.9.0...v10.9.1)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 10.9.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump rubocop from 1.89.0 to 1.90.0 in the rubocop group

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

Updates `rubocop` from 1.89.0 to 1.90.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.89.0...v1.90.0)

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

Signed-off-by: dependabot[bot] <support@github.com>

Merge remote-tracking branch 'upstream/pull/7353'

Bump @humanfs/node from 0.16.6 to 0.16.8

Bumps [@humanfs/node](https://github.com/humanwhocodes/humanfs/tree/HEAD/packages/node) from 0.16.6 to 0.16.8.
- [Release notes](https://github.com/humanwhocodes/humanfs/releases)
- [Changelog](https://github.com/humanwhocodes/humanfs/blob/main/packages/node/CHANGELOG.md)
- [Commits](https://github.com/humanwhocodes/humanfs/commits/node-v0.16.8/packages/node)

---
updated-dependencies:
- dependency-name: "@humanfs/node"
  dependency-version: 0.16.8
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #7350 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Fixed location reset error

Merge pull request #7345 from openstreetmap/dependabot/bundler/dependencies-39e1934385

Bump the dependencies group with 3 updates

Merge pull request #7346 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Merge pull request #7344 from openstreetmap/dependabot/npm_and_yarn/dependencies-06242cd4d4

Bump the dependencies group with 2 updates

Localisation updates from https://translatewiki.net.

Bump the dependencies group with 3 updates

Bumps the dependencies group with 3 updates: [opentelemetry-instrumentation-all](https://github.com/open-telemetry/opentelemetry-ruby-contrib), [webmock](https://github.com/bblimke/webmock) and [database_consistency](https://github.com/djezzzl/database_consistency).

Updates `opentelemetry-instrumentation-all` from 0.95.0 to 0.96.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.95.0...opentelemetry-instrumentation-all/v0.96.0)

Updates `webmock` from 3.26.2 to 3.26.3
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.26.2...v3.26.3)

Updates `database_consistency` from 3.0.9 to 3.0.10
- [Changelog](https://github.com/djezzzl/database_consistency/blob/master/CHANGELOG.md)
- [Commits](https://github.com/djezzzl/database_consistency/compare/v3.0.9...v3.0.10)

---
updated-dependencies:
- dependency-name: opentelemetry-instrumentation-all
  dependency-version: 0.96.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: webmock
  dependency-version: 3.26.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: database_consistency
  dependency-version: 3.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [tag2link](https://github.com/JOSM/tag2link) and [eslint](https://github.com/eslint/eslint).

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

Updates `eslint` from 10.8.1 to 10.9.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v10.8.1...v10.9.0)

---
updated-dependencies:
- dependency-name: tag2link
  dependency-version: 2026.8.21
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: eslint
  dependency-version: 10.9.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Localisation updates from https://translatewiki.net. (#7340)

Add labels to nav elements and enable html-navigation-has-label (#7336)

Merge pull request #7333 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/7331'

Merge remote-tracking branch 'upstream/pull/7330'

Merge remote-tracking branch 'upstream/pull/7329'

Bump the dependencies group with 6 updates

Bumps the dependencies group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [activerecord-import](https://github.com/zdennis/activerecord-import) | `2.2.0` | `2.3.0` |
| [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) | `5.9.5` | `5.9.6` |
| [dalli](https://github.com/petergoldstein/dalli) | `5.0.6` | `5.1.0` |
| [brakeman](https://github.com/presidentbeef/brakeman) | `8.0.5` | `8.0.6` |
| [selenium-webdriver](https://github.com/SeleniumHQ/selenium) | `4.46.0` | `4.47.0` |
| [simplecov](https://github.com/simplecov-ruby/simplecov) | `1.0.3` | `1.1.1` |

Updates `activerecord-import` from 2.2.0 to 2.3.0
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v2.2.0...v2.3.0)

Updates `doorkeeper` from 5.9.5 to 5.9.6
- [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.5...v5.9.6)

Updates `dalli` from 5.0.6 to 5.1.0
- [Release notes](https://github.com/petergoldstein/dalli/releases)
- [Changelog](https://github.com/petergoldstein/dalli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v5.0.6...v5.1.0)

Updates `brakeman` from 8.0.5 to 8.0.6
- [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.5...v8.0.6)

Updates `selenium-webdriver` from 4.46.0 to 4.47.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.46.0...selenium-4.47.0)

Updates `simplecov` from 1.0.3 to 1.1.1
- [Release notes](https://github.com/simplecov-ruby/simplecov/releases)
- [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md)
- [Commits](https://github.com/simplecov-ruby/simplecov/compare/v1.0.3...v1.1.1)

---
updated-dependencies:
- dependency-name: activerecord-import
  dependency-version: 2.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: doorkeeper
  dependency-version: 5.9.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: dalli
  dependency-version: 5.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: brakeman
  dependency-version: 8.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: selenium-webdriver
  dependency-version: 4.47.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: simplecov
  dependency-version: 1.1.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump the dependencies group with 3 updates

Bumps the dependencies group with 3 updates: [@maplibre/maplibre-gl-leaflet](https://github.com/maplibre/maplibre-gl-leaflet), [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) and [globals](https://github.com/sindresorhus/globals).

Updates `@maplibre/maplibre-gl-leaflet` from 0.1.3 to 0.1.4
- [Release notes](https://github.com/maplibre/maplibre-gl-leaflet/releases)
- [Changelog](https://github.com/maplibre/maplibre-gl-leaflet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/maplibre/maplibre-gl-leaflet/compare/v0.1.3...v0.1.4)

Updates `leaflet.locatecontrol` from 0.90.0 to 0.90.1
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.90.0...v0.90.1)

Updates `globals` from 17.9.0 to 17.11.0
- [Release notes](https://github.com/sindresorhus/globals/releases)
- [Commits](https://github.com/sindresorhus/globals/compare/v17.9.0...v17.11.0)

---
updated-dependencies:
- dependency-name: "@maplibre/maplibre-gl-leaflet"
  dependency-version: 0.1.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: leaflet.locatecontrol
  dependency-version: 0.90.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: globals
  dependency-version: 17.11.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump the rubocop group with 2 updates

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

Updates `rubocop-performance` from 1.26.1 to 1.27.0
- [Release notes](https://github.com/rubocop/rubocop-performance/releases)
- [Changelog](https://github.com/rubocop/rubocop-performance/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-performance/compare/v1.26.1...v1.27.0)

Updates `rubocop-rails` from 2.36.0 to 2.37.0
- [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.36.0...v2.37.0)

---
updated-dependencies:
- dependency-name: rubocop-performance
  dependency-version: 1.27.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: rubocop
- dependency-name: rubocop-rails
  dependency-version: 2.37.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: rubocop
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge remote-tracking branch 'upstream/pull/7328'

Merge pull request #7302 from tomhughes/terms-locale

Restore terms partial removed in 606b5c1b6a3b

Merge remote-tracking branch 'upstream/pull/5777'

Unify OAuth scope rendering

Co-authored-by: Diya Maheshwari <diyamaheshwari124@gmail.com>

Restore terms partial removed in 606b5c1b6a3b

The partial is used when rendering the terms on their own
as part of an XHR request to update the page.

Merge remote-tracking branch 'upstream/pull/7327'

update iD to v2.42.2

Merge remote-tracking branch 'upstream/pull/7326'

update iD to v2.42.1