]> git.openstreetmap.org Git - rails.git/log
rails.git
10 months agoAdd test for deactivated linkify expansion in markdown
Marwin Hochfelsner [Sun, 4 Jan 2026 17:10:37 +0000 (17:10 +0000)]
Add test for deactivated linkify expansion in markdown

10 months agoRestrict link shorthand expansion to plain text
Marwin Hochfelsner [Sun, 4 Jan 2026 16:44:01 +0000 (16:44 +0000)]
Restrict link shorthand expansion to plain text

10 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Jan 2026 12:17:56 +0000 (13:17 +0100)]
Localisation updates from https://translatewiki.net.

10 months agoMerge pull request #6687 from gravitystorm/firefox_binary
Marwin Hochfelsner [Thu, 8 Jan 2026 10:56:27 +0000 (11:56 +0100)]
Merge pull request #6687 from gravitystorm/firefox_binary

Update documentation on firefox binary config

10 months agoMerge pull request #6689 from openstreetmap/dependabot/bundler/rubocop-0b660dca05
Marwin Hochfelsner [Thu, 8 Jan 2026 10:43:00 +0000 (11:43 +0100)]
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

10 months agoMerge pull request #6688 from openstreetmap/dependabot/github_actions/dependencies...
Marwin Hochfelsner [Thu, 8 Jan 2026 10:31:19 +0000 (11:31 +0100)]
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

10 months agoMerge pull request #6686 from gravitystorm/custom_hard_coded_string
Marwin Hochfelsner [Thu, 8 Jan 2026 10:19:33 +0000 (11:19 +0100)]
Merge pull request #6686 from gravitystorm/custom_hard_coded_string

Enable erb_lint hard coded string linter

10 months agoBump rubocop-rails from 2.34.2 to 2.34.3 in the rubocop group
dependabot[bot] [Thu, 8 Jan 2026 01:20:02 +0000 (01:20 +0000)]
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>
10 months agoBump ruby/setup-ruby from 1.278.0 to 1.280.0 in the dependencies group
dependabot[bot] [Thu, 8 Jan 2026 01:19:48 +0000 (01:19 +0000)]
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>
10 months agoMerge pull request #6661 from Firefishy/add-spam-rich-text-whitespace-normalise
Andy Allan [Wed, 7 Jan 2026 17:25:06 +0000 (17:25 +0000)]
Merge pull request #6661 from Firefishy/add-spam-rich-text-whitespace-normalise

SpamScorer: normalise whitespace in comparable form

10 months agoUpdate documentation on firefox binary config
Andy Allan [Wed, 7 Jan 2026 16:42:08 +0000 (16:42 +0000)]
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.

10 months agoEnable erb_lint hard coded string linter
Andy Allan [Wed, 3 Dec 2025 11:06:18 +0000 (11:06 +0000)]
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

10 months agoMerge pull request #6685 from CommanderStorm/better-docker-guide
Andy Allan [Wed, 7 Jan 2026 15:27:25 +0000 (15:27 +0000)]
Merge pull request #6685 from CommanderStorm/better-docker-guide

Clarify how precompilation works in the docker setup guide

10 months agoimprove the docker setup guide
Frank Elsinga [Wed, 7 Jan 2026 14:33:35 +0000 (15:33 +0100)]
improve the docker setup guide

10 months agoMerge pull request #6676 from CommanderStorm/user_diary
Marwin Hochfelsner [Tue, 6 Jan 2026 21:49:39 +0000 (22:49 +0100)]
Merge pull request #6676 from CommanderStorm/user_diary

Migrate the user diary to be maplibre based

10 months agoMerge pull request #6675 from CommanderStorm/migrate-user-location-edit
Marwin Hochfelsner [Tue, 6 Jan 2026 21:49:28 +0000 (22:49 +0100)]
Merge pull request #6675 from CommanderStorm/migrate-user-location-edit

Migrate the edit location page from leaflet to Maplibre

10 months agoMerge pull request #6682 from pablobm/fix-language-selector-submit
Marwin Hochfelsner [Tue, 6 Jan 2026 20:21:58 +0000 (21:21 +0100)]
Merge pull request #6682 from pablobm/fix-language-selector-submit

Avoid language selector breaking on submit

10 months agoMerge pull request #6654 from aNsHuL5217/fix-dashboard-marker-z-order
Marwin Hochfelsner [Tue, 6 Jan 2026 20:14:30 +0000 (21:14 +0100)]
Merge pull request #6654 from aNsHuL5217/fix-dashboard-marker-z-order

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

10 months agoFix incorrect z-order f dashboard map markers (fixes #6639)
Anshul Zilpe [Tue, 6 Jan 2026 19:46:04 +0000 (01:16 +0530)]
Fix incorrect z-order f dashboard map markers (fixes #6639)

10 months agoAvoid language selector breaking on submit
Pablo Brasero [Tue, 6 Jan 2026 14:48:11 +0000 (14:48 +0000)]
Avoid language selector breaking on submit

10 months agoDocumentation, with screenshots
Pablo Brasero [Mon, 13 Oct 2025 16:41:46 +0000 (17:41 +0100)]
Documentation, with screenshots

Co-authored-by: danieldegroot2 <67521919+danieldegroot2@users.noreply.github.com>
Co-authored-by: Waldir Pimenta <waldyrious@gmail.com>
10 months agoCI action for devcontainer
Pablo Brasero [Wed, 1 Oct 2025 14:52:37 +0000 (15:52 +0100)]
CI action for devcontainer

10 months agoAdapt Selenium to work remotely as well as local.
Pablo Brasero [Fri, 26 Sep 2025 12:39:19 +0000 (13:39 +0100)]
Adapt Selenium to work remotely as well as local.

- Parallelel tests are not working with remote Selenium. For now
  let's detect the environment and disable parallel tests when
  remote.
- When using remote Selenium, the browser doesn't reset properly
  when changing preferences. As a result these are not applied.
  As a workaround, on remote we'll run a Selenium instance per
  different set of settings we need. This is not scalable, but
  for now it should be ok as there are only 3 sets.
- Tell WebMock not to interfere with requests between containers.

10 months agoConfigure devcontainer setup
Pablo Brasero [Wed, 24 Sep 2025 08:33:19 +0000 (09:33 +0100)]
Configure devcontainer setup

10 months agoFix system tests config, broken by devcontainer generator
Pablo Brasero [Wed, 24 Sep 2025 08:44:11 +0000 (09:44 +0100)]
Fix system tests config, broken by devcontainer generator

10 months ago$ ./bin/rails devcontainer # DB config written as config/devcontainer.database.yml
Pablo Brasero [Tue, 23 Sep 2025 08:45:20 +0000 (09:45 +0100)]
$ ./bin/rails devcontainer # DB config written as config/devcontainer.database.yml

10 months agoMigrate the user diary to be maplibre based
Frank Elsinga [Sun, 4 Jan 2026 22:30:03 +0000 (23:30 +0100)]
Migrate the user diary to be maplibre based

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

10 months agocreate `OSM.MapLibre.defaultSecondaryMapOptions` to share the map style between the...
Frank Elsinga [Mon, 5 Jan 2026 09:06:07 +0000 (10:06 +0100)]
create `OSM.MapLibre.defaultSecondaryMapOptions` to share the map style between the secondary maps

10 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 5 Jan 2026 12:16:27 +0000 (13:16 +0100)]
Localisation updates from https://translatewiki.net.

10 months agoMigrate user location edit page to MapLibre
Frank Elsinga [Sun, 4 Jan 2026 19:23:13 +0000 (20:23 +0100)]
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.

10 months agoMerge pull request #6665 from openstreetmap/dependabot/bundler/dependencies-98a26080d9
Marwin Hochfelsner [Thu, 1 Jan 2026 12:18:15 +0000 (13:18 +0100)]
Merge pull request #6665 from openstreetmap/dependabot/bundler/dependencies-98a26080d9

Bump the dependencies group with 4 updates

10 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 1 Jan 2026 12:18:04 +0000 (13:18 +0100)]
Localisation updates from https://translatewiki.net.

10 months agoMerge pull request #6662 from openstreetmap/dependabot/bundler/action_text-trix-2...
Marwin Hochfelsner [Thu, 1 Jan 2026 12:14:47 +0000 (13:14 +0100)]
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

10 months agoMerge pull request #6663 from openstreetmap/dependabot/github_actions/dependencies...
Marwin Hochfelsner [Thu, 1 Jan 2026 12:08:35 +0000 (13:08 +0100)]
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

10 months agoBump the dependencies group with 4 updates
dependabot[bot] [Wed, 31 Dec 2025 23:03:53 +0000 (23:03 +0000)]
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>
10 months agoBump ruby/setup-ruby from 1.275.0 to 1.278.0 in the dependencies group
dependabot[bot] [Wed, 31 Dec 2025 23:01:00 +0000 (23:01 +0000)]
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>
10 months agoBump action_text-trix from 2.1.15 to 2.1.16
dependabot[bot] [Wed, 31 Dec 2025 22:09:30 +0000 (22:09 +0000)]
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>
10 months agoSpamScorer: normalise whitespace in comparable form
Grant Slater [Tue, 30 Dec 2025 17:58:26 +0000 (17:58 +0000)]
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.

10 months agoMerge pull request #6629 from tomhughes/user-actions
Andy Allan [Tue, 30 Dec 2025 14:10:00 +0000 (14:10 +0000)]
Merge pull request #6629 from tomhughes/user-actions

Send bulk user confirmations through the state machine

10 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 29 Dec 2025 12:20:29 +0000 (13:20 +0100)]
Localisation updates from https://translatewiki.net.

10 months agoMerge pull request #6658 from Dimitar5555/patch-1
Andy Allan [Sat, 27 Dec 2025 14:44:02 +0000 (14:44 +0000)]
Merge pull request #6658 from Dimitar5555/patch-1

Update OSM Carto repository URL

10 months agoUpdate OSM Carto repository URL
Dimitar [Sat, 27 Dec 2025 14:16:30 +0000 (16:16 +0200)]
Update OSM Carto repository URL

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

10 months agoMerge remote-tracking branch 'upstream/pull/6657'
Tom Hughes [Fri, 26 Dec 2025 17:14:58 +0000 (17:14 +0000)]
Merge remote-tracking branch 'upstream/pull/6657'

10 months agoFix tooltip date offset
Marwin Hochfelsner [Fri, 26 Dec 2025 16:11:42 +0000 (17:11 +0100)]
Fix tooltip date offset

10 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 Dec 2025 12:20:12 +0000 (13:20 +0100)]
Localisation updates from https://translatewiki.net.

10 months agoFix new rubocop warnings
Tom Hughes [Thu, 25 Dec 2025 10:52:39 +0000 (10:52 +0000)]
Fix new rubocop warnings

10 months agoMerge remote-tracking branch 'upstream/pull/6653'
Tom Hughes [Thu, 25 Dec 2025 10:51:22 +0000 (10:51 +0000)]
Merge remote-tracking branch 'upstream/pull/6653'

10 months agoBump rubocop from 1.82.0 to 1.82.1 in the rubocop group
dependabot[bot] [Wed, 24 Dec 2025 23:01:30 +0000 (23:01 +0000)]
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>
10 months agoDisable dashboard map rotation and pitch (#6648)
Marwin Hochfelsner [Wed, 24 Dec 2025 09:56:18 +0000 (10:56 +0100)]
Disable dashboard map rotation and pitch (#6648)

10 months agoMerge remote-tracking branch 'upstream/pull/6606'
Tom Hughes [Wed, 24 Dec 2025 09:36:36 +0000 (09:36 +0000)]
Merge remote-tracking branch 'upstream/pull/6606'

10 months agoMerge remote-tracking branch 'upstream/pull/6649'
Tom Hughes [Wed, 24 Dec 2025 09:33:33 +0000 (09:33 +0000)]
Merge remote-tracking branch 'upstream/pull/6649'

10 months agoBump the dependencies group with 2 updates
dependabot[bot] [Tue, 23 Dec 2025 22:35:26 +0000 (22:35 +0000)]
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>
10 months agoPin connection_pool to 2.x pending a new rails release
Tom Hughes [Wed, 10 Dec 2025 13:06:31 +0000 (13:06 +0000)]
Pin connection_pool to 2.x pending a new rails release

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

10 months agoMerge remote-tracking branch 'upstream/pull/6647'
Tom Hughes [Tue, 23 Dec 2025 22:24:51 +0000 (22:24 +0000)]
Merge remote-tracking branch 'upstream/pull/6647'

10 months agoMerge remote-tracking branch 'upstream/pull/6646'
Tom Hughes [Tue, 23 Dec 2025 22:24:34 +0000 (22:24 +0000)]
Merge remote-tracking branch 'upstream/pull/6646'

10 months agoMerge remote-tracking branch 'upstream/pull/6645'
Tom Hughes [Tue, 23 Dec 2025 22:24:04 +0000 (22:24 +0000)]
Merge remote-tracking branch 'upstream/pull/6645'

10 months agoMerge remote-tracking branch 'upstream/pull/6644'
Tom Hughes [Tue, 23 Dec 2025 22:24:00 +0000 (22:24 +0000)]
Merge remote-tracking branch 'upstream/pull/6644'

10 months agoMerge pull request #6630 from tomhughes/maplibre-i18n
Marwin Hochfelsner [Tue, 23 Dec 2025 15:53:59 +0000 (16:53 +0100)]
Merge pull request #6630 from tomhughes/maplibre-i18n

Don't reinitialise i18n in maplibre code

10 months agoMerge pull request #6607 from pablobm/consistent-factories
Andy Allan [Tue, 23 Dec 2025 09:56:52 +0000 (09:56 +0000)]
Merge pull request #6607 from pablobm/consistent-factories

Ensure consistent naming for all factory files

10 months agoEnsure all factory files named in the plural
Pablo Brasero [Wed, 10 Dec 2025 14:47:09 +0000 (14:47 +0000)]
Ensure all factory files named in the plural

10 months agoBump the dependencies group with 4 updates
dependabot[bot] [Mon, 22 Dec 2025 23:04:44 +0000 (23:04 +0000)]
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>
10 months agoBump rubocop from 1.81.7 to 1.82.0 in the rubocop group
dependabot[bot] [Mon, 22 Dec 2025 23:01:44 +0000 (23:01 +0000)]
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>
10 months agoBump maplibre-gl from 5.14.0 to 5.15.0 in the dependencies group
dependabot[bot] [Mon, 22 Dec 2025 23:01:23 +0000 (23:01 +0000)]
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>
10 months agoBump ruby/setup-ruby from 1.270.0 to 1.275.0 in the dependencies group
dependabot[bot] [Mon, 22 Dec 2025 23:01:10 +0000 (23:01 +0000)]
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>
10 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Dec 2025 12:20:34 +0000 (13:20 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoMerge remote-tracking branch 'upstream/pull/6634'
Tom Hughes [Thu, 18 Dec 2025 20:21:34 +0000 (20:21 +0000)]
Merge remote-tracking branch 'upstream/pull/6634'

11 months agoBump aws-sdk-s3 from 1.207.0 to 1.208.0
dependabot[bot] [Thu, 18 Dec 2025 19:59:20 +0000 (19:59 +0000)]
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>
11 months agoMerge remote-tracking branch 'upstream/pull/6632'
Tom Hughes [Thu, 18 Dec 2025 16:45:09 +0000 (16:45 +0000)]
Merge remote-tracking branch 'upstream/pull/6632'

11 months agoMerge pull request #6631 from pablobm/swap-confirm-suspend-actions
Marwin Hochfelsner [Thu, 18 Dec 2025 15:41:28 +0000 (16:41 +0100)]
Merge pull request #6631 from pablobm/swap-confirm-suspend-actions

Swap confirm and suspend actions

11 months agoFix invalid <p> nesting in comment rendering
Marwin Hochfelsner [Thu, 18 Dec 2025 13:32:42 +0000 (14:32 +0100)]
Fix invalid <p> nesting in comment rendering

11 months agoColour 'suspend' action as dangerous
Pablo Brasero [Thu, 18 Dec 2025 12:47:08 +0000 (12:47 +0000)]
Colour 'suspend' action as dangerous

11 months agoSwap actions around for consistency with users/lists
Pablo Brasero [Thu, 18 Dec 2025 12:44:15 +0000 (12:44 +0000)]
Swap actions around for consistency with users/lists

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 18 Dec 2025 12:22:57 +0000 (13:22 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoTest visibility
Pablo Brasero [Fri, 12 Dec 2025 16:12:46 +0000 (16:12 +0000)]
Test visibility

11 months agoMove heatmap setting to own profile settings page
Pablo Brasero [Fri, 12 Dec 2025 15:34:47 +0000 (15:34 +0000)]
Move heatmap setting to own profile settings page

11 months agoFirst stab at hiding the heatmap
Pablo Brasero [Tue, 9 Dec 2025 12:59:57 +0000 (12:59 +0000)]
First stab at hiding the heatmap

11 months agoAdd user setting to show/hide their heatmap
Pablo Brasero [Tue, 9 Dec 2025 12:59:57 +0000 (12:59 +0000)]
Add user setting to show/hide their heatmap

11 months agoDon't reinitialise i18n in maplibre code
Tom Hughes [Wed, 17 Dec 2025 19:07:45 +0000 (19:07 +0000)]
Don't reinitialise i18n in maplibre code

Fixes #6624.

11 months agoSend bulk user confirmations through the state machine
Tom Hughes [Wed, 17 Dec 2025 18:51:46 +0000 (18:51 +0000)]
Send bulk user confirmations through the state machine

11 months agoMerge remote-tracking branch 'upstream/pull/6613'
Tom Hughes [Wed, 17 Dec 2025 18:43:14 +0000 (18:43 +0000)]
Merge remote-tracking branch 'upstream/pull/6613'

11 months agoMerge remote-tracking branch 'upstream/pull/6564'
Tom Hughes [Wed, 17 Dec 2025 18:34:19 +0000 (18:34 +0000)]
Merge remote-tracking branch 'upstream/pull/6564'

11 months agoMerge remote-tracking branch 'upstream/pull/6623'
Tom Hughes [Wed, 17 Dec 2025 18:26:38 +0000 (18:26 +0000)]
Merge remote-tracking branch 'upstream/pull/6623'

11 months agoMerge remote-tracking branch 'upstream/pull/6628'
Tom Hughes [Wed, 17 Dec 2025 18:23:25 +0000 (18:23 +0000)]
Merge remote-tracking branch 'upstream/pull/6628'

11 months agoMerge remote-tracking branch 'upstream/pull/6627'
Tom Hughes [Wed, 17 Dec 2025 18:22:42 +0000 (18:22 +0000)]
Merge remote-tracking branch 'upstream/pull/6627'

11 months agoMerge remote-tracking branch 'upstream/pull/6625'
Tom Hughes [Wed, 17 Dec 2025 18:21:33 +0000 (18:21 +0000)]
Merge remote-tracking branch 'upstream/pull/6625'

11 months agoFix page name for OAuth app configuration
Andy Allan [Wed, 17 Dec 2025 17:36:41 +0000 (17:36 +0000)]
Fix page name for OAuth app configuration

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

11 months agoRefactor turbo-frame element to avoid multiline conditionals inside html attribute
Andy Allan [Wed, 17 Dec 2025 17:01:09 +0000 (17:01 +0000)]
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.

11 months agoMerge pull request #6626 from gravitystorm/docker_healthcheck
Marwin Hochfelsner [Wed, 17 Dec 2025 16:13:52 +0000 (17:13 +0100)]
Merge pull request #6626 from gravitystorm/docker_healthcheck

Use a healthcheck to ensure the docker db container is active

11 months agoUse a healthcheck to ensure the docker db container is active
Andy Allan [Wed, 17 Dec 2025 15:36:46 +0000 (15:36 +0000)]
Use a healthcheck to ensure the docker db container is active

This is an extracted and reworked part of #6588

11 months agoMerge pull request #6594 from aNsHuL5217/fix-contributing-guidelines
Andy Allan [Wed, 17 Dec 2025 14:53:25 +0000 (14:53 +0000)]
Merge pull request #6594 from aNsHuL5217/fix-contributing-guidelines

Clarify fixup commits and branching guidelines

11 months agoAutomatically generate factories instead of fixtures
Andy Allan [Wed, 17 Dec 2025 12:47:57 +0000 (12:47 +0000)]
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}".

11 months agoBetter name for `#hide`, which perhaps should not exist
Pablo Brasero [Mon, 15 Dec 2025 15:20:28 +0000 (15:20 +0000)]
Better name for `#hide`, which perhaps should not exist

11 months agoMore descriptive name for "unhide" action
Pablo Brasero [Mon, 15 Dec 2025 12:50:54 +0000 (12:50 +0000)]
More descriptive name for "unhide" action

11 months agoRemove actions to hide or soft-destroy users
Pablo Brasero [Thu, 27 Nov 2025 15:25:18 +0000 (15:25 +0000)]
Remove actions to hide or soft-destroy users

11 months agoAdd UI for admins to suspend users
Pablo Brasero [Tue, 25 Nov 2025 14:34:41 +0000 (14:34 +0000)]
Add UI for admins to suspend users

11 months agoConfirmed users can be suspended
Pablo Brasero [Wed, 3 Dec 2025 16:44:10 +0000 (16:44 +0000)]
Confirmed users can be suspended

11 months agoAdd missing test for 'unhide' action
Pablo Brasero [Wed, 17 Dec 2025 11:08:23 +0000 (11:08 +0000)]
Add missing test for 'unhide' action

11 months agoPin connection_pool to 2.x pending a new rails release
Tom Hughes [Wed, 10 Dec 2025 13:06:31 +0000 (13:06 +0000)]
Pin connection_pool to 2.x pending a new rails release

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

11 months agoMerge remote-tracking branch 'upstream/pull/6621'
Tom Hughes [Tue, 16 Dec 2025 14:05:18 +0000 (14:05 +0000)]
Merge remote-tracking branch 'upstream/pull/6621'

11 months agoMerge remote-tracking branch 'upstream/pull/6620'
Tom Hughes [Tue, 16 Dec 2025 14:04:49 +0000 (14:04 +0000)]
Merge remote-tracking branch 'upstream/pull/6620'