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

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

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

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

Bump the dependencies group with 3 updates

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

Updates `actions/checkout` from 5.0.0 to 6.0.1
- [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/v5...8e8c483db84b4bee98b60c0593521ed34d9990e8)

Updates `ruby/setup-ruby` from 1.283.0 to 1.286.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/708024e6c902387ab41de36e1669e43b5ee7085e...90be1154f987f4dc0fe0dd0feedac9e473aa4ba8)

Updates `actions/setup-node` from 6.1.0 to 6.2.0
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/395ad3262231945c25e8478fd5baf05154b1d79f...6044e13b5dc448c55e2357c09f80417699197238)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: ruby/setup-ruby
  dependency-version: 1.286.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: actions/setup-node
  dependency-version: 6.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

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

Bump tag2link from 2025.11.21 to 2026.1.21 in the dependencies group

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

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

---
updated-dependencies:
- dependency-name: tag2link
  dependency-version: 2026.1.21
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
...

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

Bump lodash from 4.17.21 to 4.17.23

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.21 to 4.17.23.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.17.23
  dependency-type: indirect
...

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

Bump lodash-es from 4.17.21 to 4.17.23

Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.21 to 4.17.23.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash-es
  dependency-version: 4.17.23
  dependency-type: indirect
...

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

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

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

Merge pull request #6729 from gravitystorm/hlfan

Add hlfan to the maintainers list

Add hlfan to the maintainers list

Use media queries to hide menus instead of JavaScript

Change i18n keys to drop maplibre translation patch panel

Restructure maplibre requiring hierarchy

Extend MapLibre Map class

Move CombinedControlGroup to MapLibre controls extensions

Extend MapLibre GeolocateControl class

Extend MapLibre NavigationControl class

Extend MapLibre Marker class

Extend MapLibre Popup class

Localisation updates from https://translatewiki.net.

Merge pull request #6424 from pablobm/devcontainer

Support for Development Containers (devcontainers)

Merge pull request #6722 from tomhughes/make-plural

Update to make-plural 8.x

Merge pull request #6715 from tomhughes/remove-client-application

Drop language resources for the old client_application model

Replace custom SVG map controls with Bootstrap Icons (#6695)

Update to make-plural 8.x

Merge pull request #5862 from tomhughes/generic-linkification

Simpliy linkify normalisation to use a single array of rules

Simplify linkify normalisation to use a single array of rules

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

Update route markers also in search layout

Merge pull request #6693 from SykoDaedalus/Link-directions-to-routing-engine-demo

Add demo links for routing engine directions Fixes #6387

Improve readability by adding new lines

Add demo links for routing engine directions

- Extend the routes variable to include the selected routing mode and routing engine
- Generate routing engine demo URLs using URLSearchParams with engine-specific parameters
- Add a demo link to the directions view so routes can be opened in external routing engine demos

Merge pull request #6716 from aNsHuL5217/fix-route-icons-metaphor

Update route markers and context menu icons to cursor/flag metaphor (…

Update route markers and context menu icons to cursor/flag metaphor

Renames 'play'/'stop' to 'start'/'destination' and updates icons to standard navigation metaphors.

Drop language resources for the old client_application model

Fixes #6711.

Localisation updates from https://translatewiki.net.

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

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

Bump bootsnap from 1.21.0 to 1.21.1 in the dependencies group

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

Updates `bootsnap` from 1.21.0 to 1.21.1
- [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.21.0...v1.21.1)

---
updated-dependencies:
- dependency-name: bootsnap
  dependency-version: 1.21.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

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

Bump ruby/setup-ruby from 1.282.0 to 1.283.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.282.0 to 1.283.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/4fc31e1c823882afd7ef55985266a526c589de90...708024e6c902387ab41de36e1669e43b5ee7085e)

---
updated-dependencies:
- dependency-name: ruby/setup-ruby
  dependency-version: 1.283.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 #6708 from tomhughes/blocked-signup-message

Avoid suggesting support can create accounts

Avoid suggesting support can create accounts

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

Merge pull request #6707 from gravitystorm/rubocop_todo

Update rubocop todos

Remove unnecessary cop exclusion

This was resolved in #6629

Move cop todo list to rubocop_todo.yml

Now that we have less than 15 files remaining, it's no longer
necessary to configure them explicitly. `rubocop --auto-gen-config`
will list just the remaining files, without disabling the cop entirely

Update rubocop_todo.yml

Update to minitest 6

minitest-mock was split into a separate gem

Merge pull request #6703 from openstreetmap/dependabot/npm_and_yarn/dependencies-eaf06a8087

Bump the dependencies group across 1 directory with 4 updates

Bump the dependencies group across 1 directory with 4 updates

Bumps the dependencies group with 4 updates in the / directory: [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol), [make-plural](https://github.com/eemeli/make-plural/tree/HEAD/packages/plurals), [maplibre-gl](https://github.com/maplibre/maplibre-gl-js) and [@stylistic/eslint-plugin](https://github.com/eslint-stylistic/eslint-stylistic/tree/HEAD/packages/eslint-plugin).

Updates `leaflet.locatecontrol` from 0.85.1 to 0.86.0
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.85.1...v0.86.0)

Updates `make-plural` from 7.4.0 to 8.1.0
- [Release notes](https://github.com/eemeli/make-plural/releases)
- [Changelog](https://github.com/eemeli/make-plural/blob/main/packages/plurals/CHANGELOG.md)
- [Commits](https://github.com/eemeli/make-plural/commits/make-plural@8.1.0/packages/plurals)

Updates `maplibre-gl` from 5.15.0 to 5.16.0
- [Release notes](https://github.com/maplibre/maplibre-gl-js/releases)
- [Changelog](https://github.com/maplibre/maplibre-gl-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/maplibre/maplibre-gl-js/compare/v5.15.0...v5.16.0)

Updates `@stylistic/eslint-plugin` from 5.6.1 to 5.7.0
- [Release notes](https://github.com/eslint-stylistic/eslint-stylistic/releases)
- [Changelog](https://github.com/eslint-stylistic/eslint-stylistic/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint-stylistic/eslint-stylistic/commits/v5.7.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
  dependency-version: 0.86.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: make-plural
  dependency-version: 8.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: maplibre-gl
  dependency-version: 5.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: "@stylistic/eslint-plugin"
  dependency-version: 5.7.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

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

Merge pull request #6704 from openstreetmap/dependabot/bundler/dependencies-0868531289

Bump the dependencies group across 1 directory with 8 updates

Bump the dependencies group across 1 directory with 8 updates

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

| Package | From | To |
| --- | --- | --- |
| [bootsnap](https://github.com/rails/bootsnap) | `1.20.1` | `1.21.0` |
| [argon2](https://github.com/technion/ruby-argon2) | `2.3.2` | `2.3.3` |
| [bootstrap](https://github.com/twbs/bootstrap-rubygem) | `5.3.5` | `5.3.8` |
| [omniauth-apple](https://github.com/nhosoya/omniauth-apple) | `1.3.0` | `1.4.0` |
| [dalli](https://github.com/petergoldstein/dalli) | `3.2.8` | `4.0.0` |
| [opentelemetry-instrumentation-all](https://github.com/open-telemetry/opentelemetry-ruby-contrib) | `0.89.1` | `0.90.1` |
| [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) | `1.209.0` | `1.211.0` |
| [minitest-focus](https://github.com/seattlerb/minitest-focus) | `1.4.0` | `1.4.1` |

Updates `bootsnap` from 1.20.1 to 1.21.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.20.1...v1.21.0)

Updates `argon2` from 2.3.2 to 2.3.3
- [Changelog](https://github.com/technion/ruby-argon2/blob/master/Changelog.md)
- [Commits](https://github.com/technion/ruby-argon2/compare/v2.3.2...v2.3.3)

Updates `bootstrap` from 5.3.5 to 5.3.8
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases)
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/main/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v5.3.5...v5.3.8)

Updates `omniauth-apple` from 1.3.0 to 1.4.0
- [Release notes](https://github.com/nhosoya/omniauth-apple/releases)
- [Changelog](https://github.com/nhosoya/omniauth-apple/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nhosoya/omniauth-apple/commits)

Updates `dalli` from 3.2.8 to 4.0.0
- [Changelog](https://github.com/petergoldstein/dalli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v3.2.8...v4.0.0)

Updates `opentelemetry-instrumentation-all` from 0.89.1 to 0.90.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/instrumentation/all/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby-contrib/compare/opentelemetry-instrumentation-all/v0.89.1...opentelemetry-instrumentation-all/v0.90.1)

Updates `aws-sdk-s3` from 1.209.0 to 1.211.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 `minitest-focus` from 1.4.0 to 1.4.1
- [Changelog](https://github.com/minitest/minitest-focus/blob/master/History.rdoc)
- [Commits](https://github.com/seattlerb/minitest-focus/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: bootsnap
  dependency-version: 1.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: argon2
  dependency-version: 2.3.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: bootstrap
  dependency-version: 5.3.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: omniauth-apple
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: dalli
  dependency-version: 4.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: opentelemetry-instrumentation-all
  dependency-version: 0.90.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.211.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: minitest-focus
  dependency-version: 1.4.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

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

Merge pull request #6702 from openstreetmap/dependabot/bundler/rails-6f02697e9b

Bump rails from 8.1.1 to 8.1.2 in the rails group

Merge pull request #6701 from openstreetmap/dependabot/github_actions/dependencies-721a27d89f

Bump ruby/setup-ruby from 1.280.0 to 1.282.0 in the dependencies group

Bump rails from 8.1.1 to 8.1.2 in the rails group

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

Updates `rails` from 8.1.1 to 8.1.2
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v8.1.1...v8.1.2)

---
updated-dependencies:
- dependency-name: rails
  dependency-version: 8.1.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rails
...

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

Bump ruby/setup-ruby from 1.280.0 to 1.282.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.280.0 to 1.282.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/d5f787ce339eb0767271bc01d922e85644c2c8ab...4fc31e1c823882afd7ef55985266a526c589de90)

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

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

Update lock file

Block updates to minitest 6

Merge pull request #6698 from hlfan/coveralls-badge-link

Update coverage badge link in README.md

Update coverage badge link in README.md

Merge pull request #6696 from mmd-osm/patch/wiki2026

Update wiki_pages.yml

Fix unit test, caused by wiki_pages.yml update

Merge pull request #6697 from pablobm/patch-1

rbenv install: show which versions are available

Show how to see what versions are available

While setting up an environment in the development server, I realised I didn't know which Ruby versions were available. I had to run `rbenv versions`, which answered my question, but might not be obvious to others.

Localisation updates from https://translatewiki.net.

Updated wiki_pages.yml

Add info icon with Wiki links to map layers menu (#6669)

Add test for deactivated linkify expansion in markdown

Restrict link shorthand expansion to plain text

Localisation updates from https://translatewiki.net.

Merge pull request #6687 from gravitystorm/firefox_binary

Update documentation on firefox binary config

Merge pull request #6689 from openstreetmap/dependabot/bundler/rubocop-0b660dca05

Bump rubocop-rails from 2.34.2 to 2.34.3 in the rubocop group

Merge pull request #6688 from openstreetmap/dependabot/github_actions/dependencies-1835ec334b

Bump ruby/setup-ruby from 1.278.0 to 1.280.0 in the dependencies group

Merge pull request #6686 from gravitystorm/custom_hard_coded_string

Enable erb_lint hard coded string linter

Bump rubocop-rails from 2.34.2 to 2.34.3 in the rubocop group

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

Updates `rubocop-rails` from 2.34.2 to 2.34.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.34.2...v2.34.3)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-version: 2.34.3
  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.278.0 to 1.280.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.278.0 to 1.280.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/4c24fa5ec04b2e79eb40571b1cee2a0d2b705771...d5f787ce339eb0767271bc01d922e85644c2c8ab)

---
updated-dependencies:
- dependency-name: ruby/setup-ruby
  dependency-version: 1.280.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 #6661 from Firefishy/add-spam-rich-text-whitespace-normalise

SpamScorer: normalise whitespace in comparable form

Update documentation on firefox binary config

This setting can't be put into the config/settings.local.yml file, since
that file is ignored in the test environment. Instead, we can use
config/settings/test.local.yml file, which is git-ignored.

Enable erb_lint hard coded string linter

The implementation uses a customised linter, to add `&middot;` to the
list of punctuation that doesn't need translating.

We can remove our customised linter when this list becomes a config option,
see https://github.com/Shopify/erb_lint/pull/397

Merge pull request #6685 from CommanderStorm/better-docker-guide

Clarify how precompilation works in the docker setup guide

improve the docker setup guide

Merge pull request #6676 from CommanderStorm/user_diary

Migrate the user diary to be maplibre based

Merge pull request #6675 from CommanderStorm/migrate-user-location-edit

Migrate the edit location page from leaflet to Maplibre

Merge pull request #6682 from pablobm/fix-language-selector-submit

Avoid language selector breaking on submit

Merge pull request #6654 from aNsHuL5217/fix-dashboard-marker-z-order

Fix incorrect z-order of dashboard map markers (fixes #6639)

Fix incorrect z-order f dashboard map markers (fixes #6639)

Avoid language selector breaking on submit

Documentation, with screenshots

Co-authored-by: danieldegroot2 <67521919+danieldegroot2@users.noreply.github.com>
Co-authored-by: Waldir Pimenta <waldyrious@gmail.com>

CI action for devcontainer

Adapt Selenium to work remotely as well as local.

- Parallelel tests are not working with remote Selenium. For now
  let's detect the environment and disable parallel tests when
  remote.
- When using remote Selenium, the browser doesn't reset properly
  when changing preferences. As a result these are not applied.
  As a workaround, on remote we'll run a Selenium instance per
  different set of settings we need. This is not scalable, but
  for now it should be ok as there are only 3 sets.
- Tell WebMock not to interfere with requests between containers.

Configure devcontainer setup

Fix system tests config, broken by devcontainer generator

$ ./bin/rails devcontainer # DB config written as config/devcontainer.database.yml

Migrate the user diary to be maplibre based

Also creates `OSM.MapLibre.defaultSecondaryMapOptions` to share the map style between the secondary maps this also

create `OSM.MapLibre.defaultSecondaryMapOptions` to share the map style between the secondary maps

Localisation updates from https://translatewiki.net.

Migrate user location edit page to MapLibre

This commit migrates the user home location page (the "Edit" tab on the user profile) from Leaflet to MapLibre GL JS. This is part of a wider migration to
MapLibre across the website. The change follows the pattern established in the dashboard migration.

Merge pull request #6665 from openstreetmap/dependabot/bundler/dependencies-98a26080d9

Bump the dependencies group with 4 updates