Merge pull request #6696 from mmd-osm/patch/wiki2026

Update wiki_pages.yml

Fix unit test, caused by wiki_pages.yml update

Merge pull request #6697 from pablobm/patch-1

rbenv install: show which versions are available

Show how to see what versions are available

While setting up an environment in the development server, I realised I didn't know which Ruby versions were available. I had to run `rbenv versions`, which answered my question, but might not be obvious to others.

Localisation updates from https://translatewiki.net.

Updated wiki_pages.yml

Add info icon with Wiki links to map layers menu (#6669)

Localisation updates from https://translatewiki.net.

Merge pull request #6687 from gravitystorm/firefox_binary

Update documentation on firefox binary config

Merge pull request #6689 from openstreetmap/dependabot/bundler/rubocop-0b660dca05

Bump rubocop-rails from 2.34.2 to 2.34.3 in the rubocop group

Merge pull request #6688 from openstreetmap/dependabot/github_actions/dependencies-1835ec334b

Bump ruby/setup-ruby from 1.278.0 to 1.280.0 in the dependencies group

Merge pull request #6686 from gravitystorm/custom_hard_coded_string

Enable erb_lint hard coded string linter

Bump rubocop-rails from 2.34.2 to 2.34.3 in the rubocop group

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

Updates `rubocop-rails` from 2.34.2 to 2.34.3
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.34.2...v2.34.3)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-version: 2.34.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: rubocop
...

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

Bump ruby/setup-ruby from 1.278.0 to 1.280.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.278.0 to 1.280.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/4c24fa5ec04b2e79eb40571b1cee2a0d2b705771...d5f787ce339eb0767271bc01d922e85644c2c8ab)

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

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

Merge pull request #6661 from Firefishy/add-spam-rich-text-whitespace-normalise

SpamScorer: normalise whitespace in comparable form

Update documentation on firefox binary config

This setting can't be put into the config/settings.local.yml file, since
that file is ignored in the test environment. Instead, we can use
config/settings/test.local.yml file, which is git-ignored.

Enable erb_lint hard coded string linter

The implementation uses a customised linter, to add `&middot;` to the
list of punctuation that doesn't need translating.

We can remove our customised linter when this list becomes a config option,
see https://github.com/Shopify/erb_lint/pull/397

Merge pull request #6685 from CommanderStorm/better-docker-guide

Clarify how precompilation works in the docker setup guide

improve the docker setup guide

Merge pull request #6676 from CommanderStorm/user_diary

Migrate the user diary to be maplibre based

Merge pull request #6675 from CommanderStorm/migrate-user-location-edit

Migrate the edit location page from leaflet to Maplibre

Merge pull request #6682 from pablobm/fix-language-selector-submit

Avoid language selector breaking on submit

Merge pull request #6654 from aNsHuL5217/fix-dashboard-marker-z-order

Fix incorrect z-order of dashboard map markers (fixes #6639)

Fix incorrect z-order f dashboard map markers (fixes #6639)

Avoid language selector breaking on submit

Migrate the user diary to be maplibre based

Also creates `OSM.MapLibre.defaultSecondaryMapOptions` to share the map style between the secondary maps this also

create `OSM.MapLibre.defaultSecondaryMapOptions` to share the map style between the secondary maps

Localisation updates from https://translatewiki.net.

Migrate user location edit page to MapLibre

This commit migrates the user home location page (the "Edit" tab on the user profile) from Leaflet to MapLibre GL JS. This is part of a wider migration to
MapLibre across the website. The change follows the pattern established in the dashboard migration.

Merge pull request #6665 from openstreetmap/dependabot/bundler/dependencies-98a26080d9

Bump the dependencies group with 4 updates

Localisation updates from https://translatewiki.net.

Merge pull request #6662 from openstreetmap/dependabot/bundler/action_text-trix-2.1.16

Bump action_text-trix from 2.1.15 to 2.1.16

Merge pull request #6663 from openstreetmap/dependabot/github_actions/dependencies-a0e46cd791

Bump ruby/setup-ruby from 1.275.0 to 1.278.0 in the dependencies group

Bump the dependencies group with 4 updates

Bumps the dependencies group with 4 updates: [pg](https://github.com/ged/ruby-pg), [bootsnap](https://github.com/rails/bootsnap), [mini_racer](https://github.com/discourse/mini_racer) and [brakeman](https://github.com/presidentbeef/brakeman).

Updates `pg` from 1.6.2 to 1.6.3
- [Changelog](https://github.com/ged/ruby-pg/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.6.2...v1.6.3)

Updates `bootsnap` from 1.20.0 to 1.20.1
- [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.20.0...v1.20.1)

Updates `mini_racer` from 0.19.1 to 0.19.2
- [Changelog](https://github.com/rubyjs/mini_racer/blob/main/CHANGELOG)
- [Commits](https://github.com/discourse/mini_racer/compare/v0.19.1...v0.19.2)

Updates `brakeman` from 7.1.1 to 7.1.2
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v7.1.1...v7.1.2)

---
updated-dependencies:
- dependency-name: pg
  dependency-version: 1.6.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: bootsnap
  dependency-version: 1.20.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: mini_racer
  dependency-version: 0.19.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: brakeman
  dependency-version: 7.1.2
  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.275.0 to 1.278.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.275.0 to 1.278.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/d354de180d0c9e813cfddfcbdc079945d4be589b...4c24fa5ec04b2e79eb40571b1cee2a0d2b705771)

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

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

Bump action_text-trix from 2.1.15 to 2.1.16

Bumps [action_text-trix](https://github.com/basecamp/trix) from 2.1.15 to 2.1.16.
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.1.15...v2.1.16)

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

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

SpamScorer: normalise whitespace in comparable form

Collapse Unicode whitespace runs to a single space in SpamScorer::RichText#to_comparable_form to improve SpammyPhrase matching across newlines/tabs.

Merge pull request #6629 from tomhughes/user-actions

Send bulk user confirmations through the state machine

Localisation updates from https://translatewiki.net.

Merge pull request #6658 from Dimitar5555/patch-1

Update OSM Carto repository URL

Update OSM Carto repository URL

Ref: https://github.com/openstreetmap-carto/openstreetmap-carto/pull/5157

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

Fix tooltip date offset

Localisation updates from https://translatewiki.net.

Fix new rubocop warnings

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

Bump rubocop from 1.82.0 to 1.82.1 in the rubocop group

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

Updates `rubocop` from 1.82.0 to 1.82.1
- [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.82.0...v1.82.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-version: 1.82.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: rubocop
...

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

Disable dashboard map rotation and pitch (#6648)

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.

Send bulk user confirmations through the state machine

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'