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

Merge pull request #7235 from openstreetmap/dependabot/bundler/websocket-driver-0.8.1

Bump websocket-driver from 0.8.0 to 0.8.1

Bump websocket-driver from 0.8.0 to 0.8.1

Bumps [websocket-driver](https://github.com/faye/websocket-driver-ruby) from 0.8.0 to 0.8.1.
- [Changelog](https://github.com/faye/websocket-driver-ruby/blob/main/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-driver-ruby/compare/0.8.0...0.8.1)

---
updated-dependencies:
- dependency-name: websocket-driver
  dependency-version: 0.8.1
  dependency-type: indirect
...

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

Merge pull request #7232 from openstreetmap/dependabot/bundler/rubocop-7d7c26922e

Bump rubocop-rails from 2.35.5 to 2.36.0 in the rubocop group

Merge pull request #7233 from openstreetmap/dependabot/npm_and_yarn/dependencies-6f052d560c

Bump the dependencies group with 2 updates

Merge pull request #7231 from openstreetmap/dependabot/github_actions/dependencies-bdc85b3666

Bump the dependencies group with 2 updates

Bump the dependencies group with 5 updates

Bumps the dependencies group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [doorkeeper-openid_connect](https://github.com/doorkeeper-gem/doorkeeper-openid_connect) | `1.10.4` | `1.10.5` |
| [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) | `1.226.0` | `1.227.0` |
| [herb](https://github.com/marcoroth/herb) | `0.10.1` | `0.10.2` |
| [selenium-webdriver](https://github.com/SeleniumHQ/selenium) | `4.45.0` | `4.46.0` |
| [simplecov](https://github.com/simplecov-ruby/simplecov) | `0.22.0` | `1.0.1` |

Updates `doorkeeper-openid_connect` from 1.10.4 to 1.10.5
- [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.10.4...v1.10.5)

Updates `aws-sdk-s3` from 1.226.0 to 1.227.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.1 to 0.10.2
- [Release notes](https://github.com/marcoroth/herb/releases)
- [Commits](https://github.com/marcoroth/herb/compare/v0.10.1...v0.10.2)

Updates `selenium-webdriver` from 4.45.0 to 4.46.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.45.0...selenium-4.46.0)

Updates `simplecov` from 0.22.0 to 1.0.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/v0.22.0...v1.0.1)

---
updated-dependencies:
- dependency-name: doorkeeper-openid_connect
  dependency-version: 1.10.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.227.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: herb
  dependency-version: 0.10.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: selenium-webdriver
  dependency-version: 4.46.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: simplecov
  dependency-version: 1.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
  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: [@herb-tools/linter](https://github.com/marcoroth/herb/tree/HEAD/javascript/packages/linter) and [eslint](https://github.com/eslint/eslint).

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

Updates `eslint` from 10.6.0 to 10.7.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v10.6.0...v10.7.0)

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

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

Bump rubocop-rails from 2.35.5 to 2.36.0 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.5 to 2.36.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.35.5...v2.36.0)

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

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

Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [ruby/setup-ruby](https://github.com/ruby/setup-ruby) and [actions/setup-node](https://github.com/actions/setup-node).

Updates `ruby/setup-ruby` from 1.316.0 to 1.318.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/d45b1a4e94b71acab930e56e79c6aa188764e7f9...8e41b362d2589a22a44c1cfa214b3c83052c195b)

Updates `actions/setup-node` from 6.4.0 to 7.0.0
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e...820762786026740c76f36085b0efc47a31fe5020)

---
updated-dependencies:
- dependency-name: ruby/setup-ruby
  dependency-version: 1.318.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: actions/setup-node
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
...

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

Merge pull request #7093 from tomhughes/facebook-deletion-callback

Facebook deletion callback

Merge pull request #7229 from gravitystorm/shared-partials

Move shared partials to application directory

Move shared partials to application directory

The rails default is to fall back to the "app/views/application" directory,
and we already use that for some other partials. This provides consistency
by refactoring the partials that were previous in the "shared" directory.

Merge pull request #7207 from hlfan/flex-map-layout

Use flexbox for map layouts

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

Update title only after content download

Add error handling to loadSidebarContent

Make loadSidebarContent use promises

Make XHR parameter addition less clunky

Reuse feed selector

Localisation updates from https://translatewiki.net.

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

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

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

Implement facebook data deletion request callback

Use scopes to group omniauth routes

Merge pull request #7221 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Preserve hash for map element navigation

Disable incorrect Style/ArrayIntersect rubocop suggestion

Support false positive from rubocop

https://github.com/rubocop/rubocop/issues/15437

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

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

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

Bump the dependencies group with 5 updates

Bumps the dependencies group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [terser](https://github.com/ahorek/terser-ruby) | `1.2.7` | `1.2.8` |
| [doorkeeper-openid_connect](https://github.com/doorkeeper-gem/doorkeeper-openid_connect) | `1.10.3` | `1.10.4` |
| [aasm](https://github.com/aasm/aasm) | `5.5.2` | `6.0.0` |
| [opentelemetry-exporter-otlp](https://github.com/open-telemetry/opentelemetry-ruby) | `0.34.0` | `0.34.1` |
| [opentelemetry-sdk](https://github.com/open-telemetry/opentelemetry-ruby) | `1.12.0` | `1.12.1` |

Updates `terser` from 1.2.7 to 1.2.8
- [Release notes](https://github.com/ahorek/terser-ruby/releases)
- [Changelog](https://github.com/ahorek/terser-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ahorek/terser-ruby/compare/1.2.7...1.2.8)

Updates `doorkeeper-openid_connect` from 1.10.3 to 1.10.4
- [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.10.3...v1.10.4)

Updates `aasm` from 5.5.2 to 6.0.0
- [Changelog](https://github.com/aasm/aasm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aasm/aasm/compare/v5.5.2...v6.0.0)

Updates `opentelemetry-exporter-otlp` from 0.34.0 to 0.34.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.0...opentelemetry-exporter-otlp/v0.34.1)

Updates `opentelemetry-sdk` from 1.12.0 to 1.12.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby/releases)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby/compare/opentelemetry-sdk/v1.12.0...opentelemetry-sdk/v1.12.1)

---
updated-dependencies:
- dependency-name: terser
  dependency-version: 1.2.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: doorkeeper-openid_connect
  dependency-version: 1.10.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: aasm
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: opentelemetry-exporter-otlp
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: opentelemetry-sdk
  dependency-version: 1.12.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

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

Bump rubocop from 1.88.1 to 1.88.2 in the rubocop group

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

Updates `rubocop` from 1.88.1 to 1.88.2
- [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.88.1...v1.88.2)

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

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

Bump ruby/setup-ruby from 1.315.0 to 1.316.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.315.0 to 1.316.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/0dafeac902942906541bc140009cdbf32665b601...d45b1a4e94b71acab930e56e79c6aa188764e7f9)

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

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

Merge pull request #7216 from hlfan/maplibre-zoom

Add MapLibre zoom conversion

Add getZoom override to convert MapLibre's zoom level to OSM's format

Let flex expand the map

Consolidate height and width to flex axis

Migrate map float layout to flex layout

Remove redundant width change

Clean up overflow scroll behaviour

handle API errors with no content

Merge pull request #7156 from opengeofiction-net/make-gps-traces-optional

Make traces feature optional via traces_disabled setting

Moderation zones must have `ends_at`, consistent with user blocks

The double migration is as advised by strong_migrations,
see https://github.com/ankane/strong_migrations#setting-not-null-on-an-existing-column

Merge pull request #7212 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Merge pull request #7210 from tomhughes/maplibre-dom-util

Split maplibre/dom_util.js into two better named files

Split maplibre/dom_util.js into two better named files

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

Add autoPan-ing for draggin markers on the diary adding page

Include `map-ui` in the selectors for common columns/rows rules

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

Add support for secondary Wikimedia Commons links

Co-authored-by: r4f <3826906+r4f@users.noreply.github.com>

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

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

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

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

Merge pull request #7203 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Split space-separated event handlers into individual .on() calls

Localisation updates from https://translatewiki.net.

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

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

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

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

Bump annotaterb from 4.22.0 to 4.23.0 in the dependencies group

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

Updates `annotaterb` from 4.22.0 to 4.23.0
- [Changelog](https://github.com/drwl/annotaterb/blob/main/CHANGELOG.md)
- [Commits](https://github.com/drwl/annotaterb/compare/v4.22.0...v4.23.0)

---
updated-dependencies:
- dependency-name: annotaterb
  dependency-version: 4.23.0
  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 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.5.21 to 2026.6.26
- [Release notes](https://github.com/JOSM/tag2link/releases)
- [Commits](https://github.com/JOSM/tag2link/compare/2026.5.21...2026.6.26)

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

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

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

Bump rubocop from 1.88.0 to 1.88.1 in the rubocop group

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

Updates `rubocop` from 1.88.0 to 1.88.1
- [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.88.0...v1.88.1)

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

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

Bump ruby/setup-ruby from 1.314.0 to 1.315.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.314.0 to 1.315.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/9eb537ca036ebaed86729dcb9309076e4c5c3b74...0dafeac902942906541bc140009cdbf32665b601)

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

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

Fix LocationEvent handling

Use media-breakpoint-up for map layouts

Closes #6739

Refactor distance unit handling in directions output

Merge pull request #4540 from tomhughes/delete-own-diary

Allow users to delete their own diary entries

Merge pull request #7195 from Firefishy/fix-cdngi-link

Update CD:NGI link to correct department

Update CD:NGI link to correct department

CD:NGI is part of the Department of Land Reform and Rural Development (dlrrd), which was previously known as Department of Agriculture, Land Reform and Rural Development (DALRRD). The ngi sub-domain changed domains when the department was renamed.

Make traces feature optional via traces_disabled setting

Adds an optional traces_disabled setting to allow alternative deployments to disable the traces/tracks feature entirely. When absent (the default) traces are enabled; set to true to disable.

When disabled, all trace routes are removed via a routing constraint so requests return 404. Navigation links to traces in the header and user profile are conditionally hidden. CanCan abilities for Trace respect the setting.

Allow users to delete their own diary entries

Fixes #4175

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

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

Localisation updates from https://translatewiki.net.

update iD to v2.41.2

Merge pull request #7191 from CommanderStorm/fix-attribution-listener-leak

Fix listener leak in the link update listener of MapLibre.AttributionControl

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

Fix moveend listener leak in MapLibre AttributionControl

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

Make PaginationMethods work with subclasses of a common AR model

Merge pull request #7189 from CommanderStorm/refactoring-for-maplibre

Refactor some code to be ready to accept the new maplibre main map

move isDark to OSM.isDark

Move feature labeling code to its own module to be ready for a second connsumer in maplibres data layer

Fix one code duplication

Make sure to not use the space separated event listeners anywhere

Remove secondary wiki prefix list

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

Merge pull request #7182 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

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

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

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