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

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

Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [bootsnap](https://github.com/rails/bootsnap) and [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby).

Updates `bootsnap` from 1.19.0 to 1.20.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.19.0...v1.20.0)

Updates `aws-sdk-s3` from 1.208.0 to 1.209.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)

---
updated-dependencies:
- dependency-name: bootsnap
  dependency-version: 1.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.209.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

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

Pin connection_pool to 2.x pending a new rails release

https://github.com/rails/rails/pull/56294

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

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

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

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

Merge pull request #6630 from tomhughes/maplibre-i18n

Don't reinitialise i18n in maplibre code

Merge pull request #6607 from pablobm/consistent-factories

Ensure consistent naming for all factory files

Ensure all factory files named in the plural

Bump the dependencies group with 4 updates

Bumps the dependencies group with 4 updates: [strong_migrations](https://github.com/ankane/strong_migrations), [connection_pool](https://github.com/mperham/connection_pool), [timeout](https://github.com/ruby/timeout) and [debug](https://github.com/ruby/debug).

Updates `strong_migrations` from 2.5.1 to 2.5.2
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v2.5.1...v2.5.2)

Updates `connection_pool` from 2.5.5 to 3.0.2
- [Changelog](https://github.com/mperham/connection_pool/blob/main/Changes.md)
- [Commits](https://github.com/mperham/connection_pool/compare/v2.5.5...v3.0.2)

Updates `timeout` from 0.5.0 to 0.6.0
- [Release notes](https://github.com/ruby/timeout/releases)
- [Commits](https://github.com/ruby/timeout/compare/v0.5.0...v0.6.0)

Updates `debug` from 1.11.0 to 1.11.1
- [Release notes](https://github.com/ruby/debug/releases)
- [Commits](https://github.com/ruby/debug/compare/v1.11.0...v1.11.1)

---
updated-dependencies:
- dependency-name: strong_migrations
  dependency-version: 2.5.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: connection_pool
  dependency-version: 3.0.2
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: timeout
  dependency-version: 0.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: debug
  dependency-version: 1.11.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

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

Bump rubocop from 1.81.7 to 1.82.0 in the rubocop group

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

Updates `rubocop` from 1.81.7 to 1.82.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.81.7...v1.82.0)

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

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

Bump maplibre-gl from 5.14.0 to 5.15.0 in the dependencies group

Bumps the dependencies group with 1 update: [maplibre-gl](https://github.com/maplibre/maplibre-gl-js).

Updates `maplibre-gl` from 5.14.0 to 5.15.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.14.0...v5.15.0)

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

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

Bump ruby/setup-ruby from 1.270.0 to 1.275.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.270.0 to 1.275.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/ac793fdd38cc468a4dd57246fa9d0e868aba9085...d354de180d0c9e813cfddfcbdc079945d4be589b)

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

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

Localisation updates from https://translatewiki.net.

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

Bump aws-sdk-s3 from 1.207.0 to 1.208.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.207.0 to 1.208.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)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-version: 1.208.0
  dependency-type: direct:production
...

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

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

Merge pull request #6631 from pablobm/swap-confirm-suspend-actions

Swap confirm and suspend actions

Fix invalid <p> nesting in comment rendering

Colour 'suspend' action as dangerous

Swap actions around for consistency with users/lists

Localisation updates from https://translatewiki.net.

Test visibility

Move heatmap setting to own profile settings page

First stab at hiding the heatmap

Add user setting to show/hide their heatmap

Don't reinitialise i18n in maplibre code

Fixes #6624.

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

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

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

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

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

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

Fix page name for OAuth app configuration

This was changed in the UI in #5681 but not in the documentation

Refactor turbo-frame element to avoid multiline conditionals inside html attribute

While the original is perfectly valid erb, it's hard to read and hard for erblint to parse.

This refactor moves the multi-line conditional logic outside of the turbo-frame `src` html attribute.

Merge pull request #6626 from gravitystorm/docker_healthcheck

Use a healthcheck to ensure the docker db container is active

Use a healthcheck to ensure the docker db container is active

This is an extracted and reworked part of #6588

Merge pull request #6594 from aNsHuL5217/fix-contributing-guidelines

Clarify fixup commits and branching guidelines

Automatically generate factories instead of fixtures

From the factory_bot_rails README:

> Including factory_bot_rails in the development group of your Gemfile
> will cause Rails to generate factories instead of fixtures.

This is helpful for any developers running "rails generate model {modelname}".

Better name for `#hide`, which perhaps should not exist

More descriptive name for "unhide" action

Remove actions to hide or soft-destroy users

Add UI for admins to suspend users

Confirmed users can be suspended

Add missing test for 'unhide' action

Pin connection_pool to 2.x pending a new rails release

https://github.com/rails/rails/pull/56294

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

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

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

Pull changeset comment rich text into separate method

Stop arguments in path or query from being interpreted as hashes

Bump the dependencies group with 4 updates

Bumps the dependencies group with 4 updates: [omniauth-rails_csrf_protection](https://github.com/cookpad/omniauth-rails_csrf_protection), [connection_pool](https://github.com/mperham/connection_pool), [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) and [minitest](https://github.com/minitest/minitest).

Updates `omniauth-rails_csrf_protection` from 2.0.0 to 2.0.1
- [Release notes](https://github.com/cookpad/omniauth-rails_csrf_protection/releases)
- [Commits](https://github.com/cookpad/omniauth-rails_csrf_protection/compare/v2.0.0...v2.0.1)

Updates `connection_pool` from 2.5.5 to 3.0.2
- [Changelog](https://github.com/mperham/connection_pool/blob/main/Changes.md)
- [Commits](https://github.com/mperham/connection_pool/compare/v2.5.5...v3.0.2)

Updates `aws-sdk-s3` from 1.206.0 to 1.207.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` from 5.26.2 to 5.27.0
- [Changelog](https://github.com/minitest/minitest/blob/master/History.rdoc)
- [Commits](https://github.com/minitest/minitest/compare/v5.26.2...v5.27.0)

---
updated-dependencies:
- dependency-name: omniauth-rails_csrf_protection
  dependency-version: 2.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: connection_pool
  dependency-version: 3.0.2
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.207.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: minitest
  dependency-version: 5.27.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

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

Bump eslint from 9.39.1 to 9.39.2 in the dependencies group

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

Updates `eslint` from 9.39.1 to 9.39.2
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v9.39.1...v9.39.2)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 9.39.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 2 updates

Bumps the dependencies group with 2 updates: [ruby/setup-ruby](https://github.com/ruby/setup-ruby) and [actions/upload-artifact](https://github.com/actions/upload-artifact).

Updates `ruby/setup-ruby` from 1.269.0 to 1.270.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/d697be2f83c6234b20877c3b5eac7a7f342f0d0c...ac793fdd38cc468a4dd57246fa9d0e868aba9085)

Updates `actions/upload-artifact` from 5.0.0 to 6.0.0
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/330a01c490aca151604b8cf639adc76d48f6c5d4...b7c566a772e6b6bfb58ed0dc250532a479d7789f)

---
updated-dependencies:
- dependency-name: ruby/setup-ruby
  dependency-version: 1.270.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: actions/upload-artifact
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
...

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

Add bcl to UI languages

Localisation updates from https://translatewiki.net.

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

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

Add `OSM.MapLibre` and `OSM.MapLibre.Styles`

Localisation updates from https://translatewiki.net.

Add a supergrouping mechanism for overriding how map controls are laid out

Co-authored-by: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>

Integrate i18n support to maplibre based maps

Migrate the dashboard entry page from leaflet to maplibre

Co-authored-by: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>

Add Xvfb support to the dockerfile

This enables headless browser testing including WebGL support. firefox --headless does not support rendering WebGL without such a virtual display

Enable virtual GPU support in tests.yml

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

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

Merge pull request #6601 from deevroman/red-hearts

Use red heart in donate attribution

Merge pull request #6608 from pablobm/require-in-place

Put `require` calls outside modules unless necessary

Put `require` calls outside modules unless necessary

Use RichText for changeset comments

Add dedicated changeset comment method

Pin connection_pool to 2.x pending a new rails release

https://github.com/rails/rails/pull/56294

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

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

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

Bump the dependencies group with 5 updates

Bumps the dependencies group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [connection_pool](https://github.com/mperham/connection_pool) | `2.5.5` | `3.0.2` |
| [opentelemetry-instrumentation-all](https://github.com/open-telemetry/opentelemetry-ruby-contrib) | `0.89.0` | `0.89.1` |
| [timeout](https://github.com/ruby/timeout) | `0.4.4` | `0.5.0` |
| [selenium-webdriver](https://github.com/SeleniumHQ/selenium) | `4.38.0` | `4.39.0` |
| [rackup](https://github.com/rack/rackup) | `2.2.1` | `2.3.1` |

Updates `connection_pool` from 2.5.5 to 3.0.2
- [Changelog](https://github.com/mperham/connection_pool/blob/main/Changes.md)
- [Commits](https://github.com/mperham/connection_pool/compare/v2.5.5...v3.0.2)

Updates `opentelemetry-instrumentation-all` from 0.89.0 to 0.89.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.0...opentelemetry-instrumentation-all/v0.89.1)

Updates `timeout` from 0.4.4 to 0.5.0
- [Release notes](https://github.com/ruby/timeout/releases)
- [Commits](https://github.com/ruby/timeout/compare/v0.4.4...v0.5.0)

Updates `selenium-webdriver` from 4.38.0 to 4.39.0
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.38.0...selenium-4.39.0)

Updates `rackup` from 2.2.1 to 2.3.1
- [Release notes](https://github.com/rack/rackup/releases)
- [Changelog](https://github.com/rack/rackup/blob/main/releases.md)
- [Commits](https://github.com/rack/rackup/compare/v2.2.1...v2.3.1)

---
updated-dependencies:
- dependency-name: connection_pool
  dependency-version: 3.0.2
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: opentelemetry-instrumentation-all
  dependency-version: 0.89.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: timeout
  dependency-version: 0.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: selenium-webdriver
  dependency-version: 4.39.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: rackup
  dependency-version: 2.3.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

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

Bump maplibre-gl from 5.13.0 to 5.14.0 in the dependencies group

Bumps the dependencies group with 1 update: [maplibre-gl](https://github.com/maplibre/maplibre-gl-js).

Updates `maplibre-gl` from 5.13.0 to 5.14.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.13.0...v5.14.0)

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

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

Bump the dependencies group with 2 updates

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

Updates `ruby/setup-ruby` from 1.268.0 to 1.269.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/8aeb6ff8030dd539317f8e1769a044873b56ea71...d697be2f83c6234b20877c3b5eac7a7f342f0d0c)

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

---
updated-dependencies:
- dependency-name: ruby/setup-ruby
  dependency-version: 1.269.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: actions/setup-node
  dependency-version: 6.1.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/6583'

use red heart in donate attribution

Update CONTRIBUTING.md

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

Revert use of mediawiki GENDER magic in hsb locale

Localisation updates from https://translatewiki.net.

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

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

Pretty-print URLs in linkify

Make linkify detect shortened paths

Fix copy-pasting breaking links in linkify

Refactor linkify method

Switch to shortbread style with absolute URLs

This style and associated assets are served with CORS headers
that allow use by openstreetmap.org or 127.0.0.1

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

Clarify fixup commits and branching guidelines

Shorten cookie expiry assignment

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

Merge pull request #6591 from tomhughes/heatmap-errors

Render a not_found error for unavailable heatmaps

Fix inconsistent context menu icons (Issue #6485)

Render a not_found error for unavailable heatmaps