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

Re-enable actions for forked repos

Fixes #6822

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

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

Merge pull request #4947 from kcne/welcome-page-button-ux-improv

Move continue auth/start mapping button to appear fixed to the bottom of the welcome page

Move continue auth/start mapping button to appear fixed in footer
Pin 'Continue Auth/Start Mapping' button to bottom of page for improved user navigation and simplified OAuth process.

Merge pull request #5894 from hlfan/optimize-illustrations

Reuse elements in user creation illustrations

Add section on AI-assisted contributions

Based on the conversation in #6954

Merge pull request #6977 from openstreetmap/dependabot/bundler/addressable-2.9.0

Bump addressable from 2.8.9 to 2.9.0

Bump addressable from 2.8.9 to 2.9.0

Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.8.9 to 2.9.0.
- [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.8.9...addressable-2.9.0)

---
updated-dependencies:
- dependency-name: addressable
  dependency-version: 2.9.0
  dependency-type: direct:production
...

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

Merge pull request #6976 from openstreetmap/dependabot/bundler/rack-session-2.1.2

Bump rack-session from 2.1.1 to 2.1.2

Bump rack-session from 2.1.1 to 2.1.2

Bumps [rack-session](https://github.com/rack/rack-session) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/rack/rack-session/releases)
- [Changelog](https://github.com/rack/rack-session/blob/main/releases.md)
- [Commits](https://github.com/rack/rack-session/compare/v2.1.1...v2.1.2)

---
updated-dependencies:
- dependency-name: rack-session
  dependency-version: 2.1.2
  dependency-type: indirect
...

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

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

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

update iD to v2.39.6

Disable reverse geocoding in directions test

Deduplicate trace image handling

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

Bump vite from 7.3.1 to 7.3.2

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 7.3.1 to 7.3.2.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v7.3.2/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v7.3.2/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 7.3.2
  dependency-type: indirect
...

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

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

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

Exempt translatewiki user from translations check

Fix Codeberg SVG

Merge pull request #6938 from tomhughes/transport-vector

Switch transport layer to vector style

Merge pull request #6804 from CommanderStorm/maplibre-embed

Migrate `/export/embed.html` from leaflet to maplibre

Make sure that the new attribution control correct overriddent correctly in common.scss if used on a non-embed site

Make shortbread embed-able

Migrate the embed page from leaflet to maplibre

Bump to maplibre@5.22

Simplify the maplibre error pane CSS

Migrate controls.js to use regular JS instead of JQuery

Fix new Herb offenses

Adjust globe positioning

Sort attributes

Remove inline style

Reuse 1s and 0s

Remove single-use defs

Drop xlink namespace

Crop illustrations

Format illustrations

Rename illustrations

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

Switch transport layer to vector style

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'