Replace link icon

Replace gear icon

Align social link icons similarly to bootstrap icons

Replace home location icon

Replace company icon

Replace journal icon

Replace date and comment icons

Replace rss icon

Replace new diary icon

Bump eslint from 9.38.0 to 9.39.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.38.0 to 9.39.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v9.38.0...v9.39.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 9.39.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

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

Upgrade iD to v2.37.3

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

Update to v2.37.2

Merge pull request #6489 from tyrasd/iD-drop-obsolete-ie

drop obsolete IE related code

Localisation updates from https://translatewiki.net.

drop obsolete IE related code

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

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

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

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

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

Test: users shouldn't receive notifications of own comments

Introduce assertions to check if an email was received or not

DRY tests with assertions to check whether an email was received

Merge pull request #6410 from mmd-osm/bootstrap_contextmenu

Bootstrap contextmenu

Remove old google webmaster files

These proof-of-control files are probably not needed any more, since
the newest one dates from 13 years ago. In future, they would be more
likely controlled from the deployment-specific chef configuration,
rather than included for all deployments in this codebase.

Add previews for remaining notifications

Add gpx notification previews

Add previews for account management emails

Bump tag2link from 2025.9.21 to 2025.10.21

Bumps [tag2link](https://github.com/JOSM/tag2link) from 2025.9.21 to 2025.10.21.
- [Release notes](https://github.com/JOSM/tag2link/releases)
- [Commits](https://github.com/JOSM/tag2link/compare/2025.9.21...2025.10.21)

---
updated-dependencies:
- dependency-name: tag2link
  dependency-version: 2025.10.21
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

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

Update to rails 8.0.4

Bump osm-community-index from 5.10.0 to 6.0.0

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.10.0 to 6.0.0.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.10.0...v6.0.0)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Increase tag2link item leniency

Move tag2link transforms into module

Move tag2link_link logic to module

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

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

Update bundle

Bump maplibre-gl from 5.9.0 to 5.10.0

Bumps [maplibre-gl](https://github.com/maplibre/maplibre-gl-js) from 5.9.0 to 5.10.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.9.0...v5.10.0)

---
updated-dependencies:
- dependency-name: maplibre-gl
  dependency-version: 5.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Bump ruby/setup-ruby from 1.265.0 to 1.267.0

Bumps [ruby/setup-ruby](https://github.com/ruby/setup-ruby) from 1.265.0 to 1.267.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/ab177d40ee5483edb974554986f56b33477e21d0...d5126b9b3579e429dd52e51e68624dda2e05be25)

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

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

Forward preferred color scheme to id-container

Localisation updates from https://translatewiki.net.

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

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

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

feat: added sotm africa 2025 conference details

chore: clean up past global sotm 2025 conference details

Remove serializer that duplicates default behavior

Bump actions/upload-artifact from 4.6.2 to 5.0.0

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 5.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/ea165f8d65b6e75b540449e92b4886f43607fa02...330a01c490aca151604b8cf639adc76d48f6c5d4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

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

feat: add social links and company to user api endpoint

Co-authored-by: Pablo Brasero <36066+pablobm@users.noreply.github.com>

Bump eslint-formatter-compact from 8.40.0 to 9.0.1

Bumps [eslint-formatter-compact](https://github.com/fregante/eslint-formatters) from 8.40.0 to 9.0.1.
- [Commits](https://github.com/fregante/eslint-formatters/commits)

---
updated-dependencies:
- dependency-name: eslint-formatter-compact
  dependency-version: 9.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

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

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

Localisation updates from https://translatewiki.net.

Clear out apt repo after installing packages

Merge pull request #6466 from tomhughes/tracepoint-order

Order tracepoints before asking for the first one

Update path to community index data files

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

Order tracepoints before asking for the first one

This fixes a new warning in rails 8.1.0 about calling first
on a query that does not have a defined order.

Merge pull request #6465 from pablobm/xml-module-shenanigans

Avoid stealth include of LibXML module

Avoid referencing submodule XML directly

Remove spurious requires that pretend that XML is a top-level module

Localisation updates from https://translatewiki.net.

Bump osm-community-index from 5.9.3 to 5.10.0

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.9.3 to 5.10.0.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.9.3...v5.10.0)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-version: 5.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

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

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

Remove unused Leaflet contextmenu plugin

Replace Leaflet contextmenu plugin w/ Bootstrap

No need as that's the default behaviour

Remove unnecessary requires; use gems when possible

Update bundle

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

Merge pull request #6460 from pablobm/remove-travis-leftovers

Remove leftover Travis references

Remove leftover Travis references

Bump @stylistic/eslint-plugin from 5.4.0 to 5.5.0

Bumps [@stylistic/eslint-plugin](https://github.com/eslint-stylistic/eslint-stylistic/tree/HEAD/packages/eslint-plugin) from 5.4.0 to 5.5.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.5.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@stylistic/eslint-plugin"
  dependency-version: 5.5.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

Documentation review

Merge pull request #6456 from rkoeze/rkoeze/remove-empty-initializer

Remove unused initializer

Localisation updates from https://translatewiki.net.

Remove unused initializer

Remove unused initializer file that is no longer included by default in new Rails
applications.

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

Bump minitest and remove version constraint

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

Bump eslint from 9.37.0 to 9.38.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.37.0 to 9.38.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v9.37.0...v9.38.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 9.38.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

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

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

Localisation updates from https://translatewiki.net.

Enable ActionMailer Previews

The previews run using the development database, which may or may not already contain
sufficient records (e.g. diary comments). So to avoid failures, we generate content
using factory bot, and to avoid filling your development database with duplicate data,
we run the previews inside a transaction.

If you manually create records in the database that collide with factory bot (e.g. users
with the same email pattern as the factory) then you'll need to update your manual records
to avoid collisions.

Rename "Map Key" to "Legend" in UI and tests for consistency

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

Bump actions/setup-node from 5.0.0 to 6.0.0

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/a0853c24544627f65ddf259abe73b1d18a591444...2028fbc5c25fe9cf00d9f06a71cc4710d4507903)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

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

Update bundle

Bump @types/leaflet from 1.9.20 to 1.9.21

Bumps [@types/leaflet](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/leaflet) from 1.9.20 to 1.9.21.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/leaflet)

---
updated-dependencies:
- dependency-name: "@types/leaflet"
  dependency-version: 1.9.21
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

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

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

Remove TODOs covered by issue #6092

Remove TODO covered by #6442

Localisation updates from https://translatewiki.net.

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