Add some whitespace

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

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

Use consistent sizing for profile edit buttons

Instantiate js controllers only once needed

Move controller invoking event handlers outside said controllers

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

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

Localisation updates from https://translatewiki.net.

Store selected editor color scheme

Add editor color scheme select to preferences form

Set editor color scheme depending on user preference

Add tests for user.preferred_color_scheme

Co-authored-by: Pablo Brasero <pablo@pablobm.com>

Precompute color scheme fallback in user model

Co-authored-by: Pablo Brasero <pablo@pablobm.com>

Add Nominatim description term: man_made.planter

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

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

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

Update bundle

Bump eslint from 9.39.0 to 9.39.1

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

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 9.39.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Bump maplibre-gl from 5.10.0 to 5.11.0

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

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

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

Localisation updates from https://translatewiki.net.

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

Hide context menu icon characters

Replace routing mode icons

Replace pencil icon

Replace flash icon

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'

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