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

Disable some svgo plugins

Update rack to 3.2.6

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

Bump lodash from 4.17.23 to 4.18.1

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

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

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

Remove plural magic

Localisation updates from https://translatewiki.net.

Update herb config to 0.9.4

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

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

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

Bump the dependencies group with 4 updates

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

Updates `aws-sdk-s3` from 1.217.0 to 1.218.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.9.2 to 0.9.4
- [Release notes](https://github.com/marcoroth/herb/releases)
- [Commits](https://github.com/marcoroth/herb/compare/v0.9.2...v0.9.4)

Updates `overcommit` from 0.68.0 to 0.69.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.68.0...v0.69.0)

Updates `minitest` from 6.0.2 to 6.0.3
- [Changelog](https://github.com/minitest/minitest/blob/master/History.rdoc)
- [Commits](https://github.com/minitest/minitest/compare/v6.0.2...v6.0.3)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-version: 1.218.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: herb
  dependency-version: 0.9.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: overcommit
  dependency-version: 0.69.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: minitest
  dependency-version: 6.0.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

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

Bump @herb-tools/linter from 0.9.2 to 0.9.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.9.2 to 0.9.4
- [Release notes](https://github.com/marcoroth/herb/releases)
- [Commits](https://github.com/marcoroth/herb/commits/v0.9.4/javascript/packages/linter)

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

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

Bump ruby/setup-ruby from 1.295.0 to 1.299.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.295.0 to 1.299.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/319994f95fa847cf3fb3cd3dbe89f6dcde9f178f...3ff19f5e2baf30647122352b96108b1fbe250c64)

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

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

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

Rename mag_map logo variant

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

Merge pull request #6932 from Arpan200502/rename-heatmap-to-contribution-calendar

Rename heatmap label to Contribution Calendar

Merge pull request #6947 from Arpan200502/fix/login-tab-order

Fix login tab order for "Lost your password?" link

Merge pull request #6866 from Arpan200502/feature-tou-welcome-banner

Add Terms of Use notice to welcome banner

Localisation updates from https://translatewiki.net.

Fix login tab order by moving 'Lost your password?' link

Merge pull request #6948 from openstreetmap/dependabot/bundler/action_text-trix-2.1.18

Bump action_text-trix from 2.1.17 to 2.1.18

Bump action_text-trix from 2.1.17 to 2.1.18

Bumps [action_text-trix](https://github.com/basecamp/trix) from 2.1.17 to 2.1.18.
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.1.17...v2.1.18)

---
updated-dependencies:
- dependency-name: action_text-trix
  dependency-version: 2.1.18
  dependency-type: indirect
...

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

Rename heatmap to contribution calendar (UI + i18n)

Add Terms of Use notice to welcome banner

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

Flatten barely used directories

Replace reverse_directions icon

Adjust feed icon definitions

Replace role icon

Remove redundant labels

Use shared loader partial

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

Use Noticed to deliver notifications of direct messages

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

Use Noticed to deliver a "new follower" notification

Localisation updates from https://translatewiki.net.

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

Bump picomatch from 4.0.3 to 4.0.4

Bumps [picomatch](https://github.com/micromatch/picomatch) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/micromatch/picomatch/releases)
- [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/picomatch/compare/4.0.3...4.0.4)

---
updated-dependencies:
- dependency-name: picomatch
  dependency-version: 4.0.4
  dependency-type: indirect
...

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

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

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

Merge pull request #6940 from openstreetmap/dependabot/bundler/rubocop-4124cc5fc6

Bump rubocop from 1.85.1 to 1.86.0 in the rubocop group

Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [terser](https://github.com/ahorek/terser-ruby) and [database_consistency](https://github.com/djezzzl/database_consistency).

Updates `terser` from 1.2.6 to 1.2.7
- [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.6...1.2.7)

Updates `database_consistency` from 3.0.1 to 3.0.2
- [Changelog](https://github.com/djezzzl/database_consistency/blob/master/CHANGELOG.md)
- [Commits](https://github.com/djezzzl/database_consistency/compare/v3.0.1...v3.0.2)

---
updated-dependencies:
- dependency-name: terser
  dependency-version: 1.2.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: database_consistency
  dependency-version: 3.0.2
  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 4 updates

Bumps the dependencies group with 4 updates: [@mapbox/mapbox-gl-rtl-text](https://github.com/mapbox/mapbox-gl-rtl-text), [maplibre-gl](https://github.com/maplibre/maplibre-gl-js), [tag2link](https://github.com/JOSM/tag2link) and [eslint](https://github.com/eslint/eslint).

Updates `@mapbox/mapbox-gl-rtl-text` from 0.3.0 to 0.4.0
- [Release notes](https://github.com/mapbox/mapbox-gl-rtl-text/releases)
- [Commits](https://github.com/mapbox/mapbox-gl-rtl-text/compare/v0.3.0...v0.4.0)

Updates `maplibre-gl` from 5.20.2 to 5.21.1
- [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.20.2...v5.21.1)

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

Updates `eslint` from 10.0.3 to 10.1.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v10.0.3...v10.1.0)

---
updated-dependencies:
- dependency-name: "@mapbox/mapbox-gl-rtl-text"
  dependency-version: 0.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: maplibre-gl
  dependency-version: 5.21.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: tag2link
  dependency-version: 2026.3.21
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: eslint
  dependency-version: 10.1.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.85.1 to 1.86.0 in the rubocop group

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

Updates `rubocop` from 1.85.1 to 1.86.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.85.1...v1.86.0)

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

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

Merge pull request #6921 from tomhughes/erb-no-instance-variables-in-partials

Enable erb-no-instance-variables-in-partials lint rule

Merge pull request #6933 from tomhughes/noticed-notifications

Convert more notifications to use Noticed

Merge pull request #6922 from tomhughes/totp

Send TOTP cookies for all pages with maps

Merge pull request #6929 from tomhughes/notification-queue

Configure queues for new notification system

Deliver diary comment notifications using Noticed

Deliver note comment notifications using Noticed

Pluralise test factory name for consistency

Remove instance variables from partials

Update to rails 8.1.3

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

Update Docker Desktop Homebrew URL in DOCKER.md

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

Configure queues for notifications

Fixes #6924

Merge some single use partials into their parent templates

Group pagination data into a struct

Option to disable parallel tests

Update to rails 8.1.2.1

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

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

update iD to v2.39.5

Localisation updates from https://translatewiki.net.

Strengthen negative assertions

Work on macOS, following a change in libxml2

This is a follow-up to https://github.com/openstreetmap/openstreetmap-website/pull/6902

Set getRoute default function parameters

Merge pull request #6923 from tyrasd/iD-2.39.3

upgrade iD to v2.39.3

upgrade iD to v2.39.3

Send TOTP cookie for all pages with a map

All domain for TOTP cookies to be configured

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

Merge pull request #6894 from tomhughes/svgo-config

Modernise svgo configuration so that it works

Merge pull request #6920 from tomhughes/erb-strict-locals-required

Enforce declaration of local variables for partials

Enforce declaration of local variables for partials

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

Bump flatted from 3.3.2 to 3.4.2

Bumps [flatted](https://github.com/WebReflection/flatted) from 3.3.2 to 3.4.2.
- [Commits](https://github.com/WebReflection/flatted/compare/v3.3.2...v3.4.2)

---
updated-dependencies:
- dependency-name: flatted
  dependency-version: 3.4.2
  dependency-type: indirect
...

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

Merge pull request #6918 from tyrasd/iD-2.39.2

update iD to v2.39.2

update iD to v2.39.2

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

upgrade iD to v2.39.0

Remove gender magic

Localisation updates from https://translatewiki.net.

Merge pull request #6914 from hlfan/herb-linting

Fix new Herb warning

Move list outside the branches

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

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

Deduplicate elements across branches

Place ActionView helpers closer to view output

Remove inline class name interpolation

Use i18n _html flag

Remove unnecessary then keyword

Remove empty control block

Drop no longer supported herb analyze switches

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

Disable new herb rules with failures

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