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

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

Deduplicate elements across branches

Place ActionView helpers closer to view output

Remove inline class name interpolation

Use i18n _html flag

Remove unnecessary then keyword

Remove empty control block

Drop no longer supported herb analyze switches

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

Disable new herb rules with failures

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

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

Bump the dependencies group with 6 updates

Bumps the dependencies group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) | `5.8.2` | `5.9.0` |
| [doorkeeper-openid_connect](https://github.com/doorkeeper-gem/doorkeeper-openid_connect) | `1.8.11` | `1.9.0` |
| [opentelemetry-instrumentation-all](https://github.com/open-telemetry/opentelemetry-ruby-contrib) | `0.90.1` | `0.91.0` |
| [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) | `1.215.0` | `1.217.0` |
| [herb](https://github.com/marcoroth/herb) | `0.8.10` | `0.9.2` |
| [webmock](https://github.com/bblimke/webmock) | `3.26.1` | `3.26.2` |

Updates `doorkeeper` from 5.8.2 to 5.9.0
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.8.2...v.5.9.0)

Updates `doorkeeper-openid_connect` from 1.8.11 to 1.9.0
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/compare/v1.8.11...v1.9.0)

Updates `opentelemetry-instrumentation-all` from 0.90.1 to 0.91.0
- [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.90.1...opentelemetry-instrumentation-all/v0.91.0)

Updates `aws-sdk-s3` from 1.215.0 to 1.217.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.8.10 to 0.9.2
- [Release notes](https://github.com/marcoroth/herb/releases)
- [Commits](https://github.com/marcoroth/herb/compare/v0.8.10...v0.9.2)

Updates `webmock` from 3.26.1 to 3.26.2
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.26.1...v3.26.2)

---
updated-dependencies:
- dependency-name: doorkeeper
  dependency-version: 5.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: doorkeeper-openid_connect
  dependency-version: 1.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: opentelemetry-instrumentation-all
  dependency-version: 0.91.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.217.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: herb
  dependency-version: 0.9.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: webmock
  dependency-version: 3.26.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: [maplibre-gl](https://github.com/maplibre/maplibre-gl-js) and [@herb-tools/linter](https://github.com/marcoroth/herb/tree/HEAD/javascript/packages/linter).

Updates `maplibre-gl` from 5.20.0 to 5.20.2
- [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.0...v5.20.2)

Updates `@herb-tools/linter` from 0.8.10 to 0.9.2
- [Release notes](https://github.com/marcoroth/herb/releases)
- [Commits](https://github.com/marcoroth/herb/commits/v0.9.2/javascript/packages/linter)

---
updated-dependencies:
- dependency-name: maplibre-gl
  dependency-version: 5.20.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: "@herb-tools/linter"
  dependency-version: 0.9.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

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

Bump ruby/setup-ruby from 1.292.0 to 1.295.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.292.0 to 1.295.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/4eb9f110bac952a8b68ecf92e3b5c7a987594ba6...319994f95fa847cf3fb3cd3dbe89f6dcde9f178f)

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

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

First use of Noticed to deliver notifications

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

Bump loofah from 2.25.0 to 2.25.1

Bumps [loofah](https://github.com/flavorjones/loofah) from 2.25.0 to 2.25.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.25.0...v2.25.1)

---
updated-dependencies:
- dependency-name: loofah
  dependency-version: 2.25.1
  dependency-type: indirect
...

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

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

Make the diary comment log in UI a regular paragraph

Merge pull request #6902 from pablobm/libxml-error

Adapt assertion to work on different architectures

Adapt assertion to work on different architectures

This assertion was working well until recently. For some reason now it
doesn't work on macOS, where the error from LibXML is different from
what it was before.

On Debian 13 (Trixie), I can still see the error we have been expecting
for over a year:

```
Fatal error: Start tag expected, '<' not found at :1.
```

However, on macOS 15.7.4 (Sequoia) I am now seeing:

```
Fatal error: Document is empty at :1.
```

I'm guessing this is a change in the underlying libxml2. I can see
that on macOS I upgraded the library to 2.15.2 earlier this week
(using Homebrew) Perhaps this has a slightly different behaviour from
the 2.12.17 I have on Debian.

We'll be using Noticed to handle user notifications

This adds the [Noticed](https://github.com/excid3/noticed) gem, generates and
performs its migrations, and adds the base notifier at
`app/notifiers/application_notifier.rb`. Where appropriate, coding style has
been adapted to meet that of this project.

Detail of the migrations:

- Generated with `bin/rails noticed:install:migrations`.
- Merged into a single migration.
- Removed code to detect the type of primary and foreign keys.
- Converted to use Rails 8.1 semantics (originally it was 6.1).

Merge pull request #4314 from tomhughes/cloudflare-turnstile

Add support for using an cloudflare turnstile widget during signup

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

Add translation for lkt language name

Remove translations using GENDER magic from lkt locale

Add Codeberg social link icon and URL pattern support

Fixes #6813

Merge pull request #6898 from pablobm/lakota-language

Add Lakota to UI languages

Add Lakota to UI languages

Localisation updates from https://translatewiki.net.

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

Add Wikimedia Italia 5x1000 banner

Allow localized & country-specific banners

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

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

Merge pull request #6886 from tomhughes/parse-html

Add parse_html helper to tests

Convert `UserMailer#changeset_comment_notification` to new style

Convert `UserMailer#note_comment_notification` to new style

Convert `UserMailer#message_notification` to new style

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

Convert `UserMailer#gpx_failure` to new style

Convert `UserMailer#gpx_success` to new style

Convert `UserMailer#follow_notification` to new style

Convert `UserMailer#diary_comment_notification` to new style

Convert `UserMailer#lost_password` to new style

Convert `UserMailer#email_confirm` to new style

Convert `UserMailer#signup_confirm` to new style

Bump action_text-trix from 2.1.16 to 2.1.17

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

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

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

Add a parse_html test helper to reduce boilerplate

Convert a missed mailer test to use parse_html_body

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

Add test for `UserMailer#note_comment_notification`

Add test for `UserMailer#follow_notification`

Renamed tests to better reflect what they do

Add test for `UserMailer#test_lost_password`

Add test for `UserMailer#email_confirm`

Add test for `UserMailer#signup_confirm`

Localisation updates from https://translatewiki.net.

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

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

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

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

Bump the dependencies group with 4 updates

Bumps the dependencies group with 4 updates: [opentelemetry-exporter-otlp](https://github.com/open-telemetry/opentelemetry-ruby), [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby), [timeout](https://github.com/ruby/timeout) and [database_consistency](https://github.com/djezzzl/database_consistency).

Updates `opentelemetry-exporter-otlp` from 0.31.1 to 0.32.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-ruby/blob/main/exporter/otlp/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby/compare/opentelemetry-exporter-otlp/v0.31.1...opentelemetry-exporter-otlp/v0.32.0)

Updates `aws-sdk-s3` from 1.214.0 to 1.215.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 `timeout` from 0.6.0 to 0.6.1
- [Release notes](https://github.com/ruby/timeout/releases)
- [Commits](https://github.com/ruby/timeout/compare/v0.6.0...v0.6.1)

Updates `database_consistency` from 3.0.0 to 3.0.1
- [Changelog](https://github.com/djezzzl/database_consistency/blob/master/CHANGELOG.md)
- [Commits](https://github.com/djezzzl/database_consistency/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: opentelemetry-exporter-otlp
  dependency-version: 0.32.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.215.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: timeout
  dependency-version: 0.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: database_consistency
  dependency-version: 3.0.1
  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: [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol), [maplibre-gl](https://github.com/maplibre/maplibre-gl-js), [@stylistic/eslint-plugin](https://github.com/eslint-stylistic/eslint-stylistic/tree/HEAD/packages/eslint-plugin) and [eslint](https://github.com/eslint/eslint).

Updates `leaflet.locatecontrol` from 0.88.0 to 0.89.0
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.88.0...v0.89.0)

Updates `maplibre-gl` from 5.19.0 to 5.20.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.19.0...v5.20.0)

Updates `@stylistic/eslint-plugin` from 5.9.0 to 5.10.0
- [Release notes](https://github.com/eslint-stylistic/eslint-stylistic/releases)
- [Changelog](https://github.com/eslint-stylistic/eslint-stylistic/blob/v5.10.0/CHANGELOG.md)
- [Commits](https://github.com/eslint-stylistic/eslint-stylistic/commits/v5.10.0/packages/eslint-plugin)

Updates `eslint` from 10.0.2 to 10.0.3
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v10.0.2...v10.0.3)

---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
  dependency-version: 0.89.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: maplibre-gl
  dependency-version: 5.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: "@stylistic/eslint-plugin"
  dependency-version: 5.10.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: eslint
  dependency-version: 10.0.3
  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.85.0 to 1.85.1 in the rubocop group

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

Updates `rubocop` from 1.85.0 to 1.85.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.85.0...v1.85.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-version: 1.85.1
  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.289.0 to 1.292.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.289.0 to 1.292.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/19a43a6a2428d455dbd1b85344698725179c9d8c...4eb9f110bac952a8b68ecf92e3b5c7a987594ba6)

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

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

Break instruction lines in directions table

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

Shortcut to parse HTML emails

Simpler way to use URL helpers in mailer tests

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

Expand robots.txt to stop pages robots are getting stuck in

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

Clarify ambiguous map/edit links on trace detail page

Localisation updates from https://translatewiki.net.

Prevent redirects to the login page being cached

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

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

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

More padding for menu items on mobile devices

Merge pull request #6868 from tomhughes/thunderforest-urls

Drop subdomains from thunderforest layer URLs

Drop subdomains from thunderforest layer URLs

Update leaflet-osm to latest upstream version

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

Faster, more idiomatic, easier to read

Localisation updates from https://translatewiki.net.

Raise linkify regex timeout

Integrate Tom's timeout patch that closes #6812 and closes #6799

Merge pull request #6818 from CommanderStorm/fix-traces

Fix traces going off screen for very long filenames

Merge pull request #6782 from CommanderStorm/maplibre-error

Add Human facing error messages when users without WebGL use

Simplify AssetHelper logic paths

Merge pull request #6862 from tomhughes/multiple-classes

Fix new rubocop Style/OneClassPerFile warnings

Fix new rubocop Style/OneClassPerFile warnings

Fix new rubocop warning

Update rubocop todo file

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

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

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

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