]> git.openstreetmap.org Git - rails.git/log
rails.git
3 hours agoMerge remote-tracking branch 'upstream/pull/7202' master
Tom Hughes [Wed, 1 Jul 2026 23:41:27 +0000 (00:41 +0100)]
Merge remote-tracking branch 'upstream/pull/7202'

3 hours agoMerge remote-tracking branch 'upstream/pull/7201'
Tom Hughes [Wed, 1 Jul 2026 23:41:13 +0000 (00:41 +0100)]
Merge remote-tracking branch 'upstream/pull/7201'

3 hours agoMerge remote-tracking branch 'upstream/pull/7200'
Tom Hughes [Wed, 1 Jul 2026 23:41:09 +0000 (00:41 +0100)]
Merge remote-tracking branch 'upstream/pull/7200'

3 hours agoMerge remote-tracking branch 'upstream/pull/7199'
Tom Hughes [Wed, 1 Jul 2026 23:40:49 +0000 (00:40 +0100)]
Merge remote-tracking branch 'upstream/pull/7199'

3 hours agoBump annotaterb from 4.22.0 to 4.23.0 in the dependencies group
dependabot[bot] [Wed, 1 Jul 2026 23:15:27 +0000 (23:15 +0000)]
Bump annotaterb from 4.22.0 to 4.23.0 in the dependencies group

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

Updates `annotaterb` from 4.22.0 to 4.23.0
- [Changelog](https://github.com/drwl/annotaterb/blob/main/CHANGELOG.md)
- [Commits](https://github.com/drwl/annotaterb/compare/v4.22.0...v4.23.0)

---
updated-dependencies:
- dependency-name: annotaterb
  dependency-version: 4.23.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
3 hours agoBump the dependencies group with 2 updates
dependabot[bot] [Wed, 1 Jul 2026 23:13:14 +0000 (23:13 +0000)]
Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [tag2link](https://github.com/JOSM/tag2link) and [eslint](https://github.com/eslint/eslint).

Updates `tag2link` from 2026.5.21 to 2026.6.26
- [Release notes](https://github.com/JOSM/tag2link/releases)
- [Commits](https://github.com/JOSM/tag2link/compare/2026.5.21...2026.6.26)

Updates `eslint` from 10.5.0 to 10.6.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v10.5.0...v10.6.0)

---
updated-dependencies:
- dependency-name: tag2link
  dependency-version: 2026.6.26
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: eslint
  dependency-version: 10.6.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
3 hours agoBump rubocop from 1.88.0 to 1.88.1 in the rubocop group
dependabot[bot] [Wed, 1 Jul 2026 23:12:46 +0000 (23:12 +0000)]
Bump rubocop from 1.88.0 to 1.88.1 in the rubocop group

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

Updates `rubocop` from 1.88.0 to 1.88.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.88.0...v1.88.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
3 hours agoBump ruby/setup-ruby from 1.314.0 to 1.315.0 in the dependencies group
dependabot[bot] [Wed, 1 Jul 2026 23:12:29 +0000 (23:12 +0000)]
Bump ruby/setup-ruby from 1.314.0 to 1.315.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.314.0 to 1.315.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/9eb537ca036ebaed86729dcb9309076e4c5c3b74...0dafeac902942906541bc140009cdbf32665b601)

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

Signed-off-by: dependabot[bot] <support@github.com>
44 hours agoMerge pull request #4540 from tomhughes/delete-own-diary
Marwin Hochfelsner [Tue, 30 Jun 2026 06:00:31 +0000 (08:00 +0200)]
Merge pull request #4540 from tomhughes/delete-own-diary

Allow users to delete their own diary entries

44 hours agoMerge pull request #7195 from Firefishy/fix-cdngi-link
Marwin Hochfelsner [Tue, 30 Jun 2026 05:59:05 +0000 (07:59 +0200)]
Merge pull request #7195 from Firefishy/fix-cdngi-link

Update CD:NGI link to correct department

2 days agoUpdate CD:NGI link to correct department
Grant Slater [Mon, 29 Jun 2026 21:16:43 +0000 (22:16 +0100)]
Update CD:NGI link to correct department

CD:NGI is part of the Department of Land Reform and Rural Development (dlrrd), which was previously known as Department of Agriculture, Land Reform and Rural Development (DALRRD). The ngi sub-domain changed domains when the department was renamed.

2 days agoAllow users to delete their own diary entries
Tom Hughes [Sun, 25 Feb 2024 11:02:15 +0000 (11:02 +0000)]
Allow users to delete their own diary entries

Fixes #4175

2 days agoMerge remote-tracking branch 'upstream/pull/7192' live
Tom Hughes [Mon, 29 Jun 2026 16:14:45 +0000 (17:14 +0100)]
Merge remote-tracking branch 'upstream/pull/7192'

2 days agoMerge remote-tracking branch 'upstream/pull/7193'
Tom Hughes [Mon, 29 Jun 2026 16:14:34 +0000 (17:14 +0100)]
Merge remote-tracking branch 'upstream/pull/7193'

2 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 29 Jun 2026 12:21:11 +0000 (14:21 +0200)]
Localisation updates from https://translatewiki.net.

2 days agoupdate iD to v2.41.2
Martin Raifer [Mon, 29 Jun 2026 11:03:43 +0000 (13:03 +0200)]
update iD to v2.41.2

3 days agoMerge pull request #7191 from CommanderStorm/fix-attribution-listener-leak
Marwin Hochfelsner [Sun, 28 Jun 2026 13:05:06 +0000 (15:05 +0200)]
Merge pull request #7191 from CommanderStorm/fix-attribution-listener-leak

Fix listener leak in the link update listener of MapLibre.AttributionControl

3 days agoMerge remote-tracking branch 'upstream/pull/7190'
Tom Hughes [Sun, 28 Jun 2026 08:38:26 +0000 (09:38 +0100)]
Merge remote-tracking branch 'upstream/pull/7190'

3 days agoFix moveend listener leak in MapLibre AttributionControl
Frank Elsinga [Sun, 28 Jun 2026 08:20:48 +0000 (10:20 +0200)]
Fix moveend listener leak in MapLibre AttributionControl

3 days agoMerge remote-tracking branch 'upstream/pull/7136'
Tom Hughes [Sun, 28 Jun 2026 08:31:07 +0000 (09:31 +0100)]
Merge remote-tracking branch 'upstream/pull/7136'

4 days agoMake PaginationMethods work with subclasses of a common AR model
Pablo Brasero [Sat, 27 Jun 2026 22:19:50 +0000 (23:19 +0100)]
Make PaginationMethods work with subclasses of a common AR model

4 days agoMerge pull request #7189 from CommanderStorm/refactoring-for-maplibre
Marwin Hochfelsner [Sat, 27 Jun 2026 22:20:21 +0000 (00:20 +0200)]
Merge pull request #7189 from CommanderStorm/refactoring-for-maplibre

Refactor some code to be ready to accept the new maplibre main map

4 days agomove isDark to OSM.isDark
Frank Elsinga [Sat, 27 Jun 2026 16:29:24 +0000 (18:29 +0200)]
move isDark to OSM.isDark

4 days agoMove feature labeling code to its own module to be ready for a second connsumer in...
Frank Elsinga [Sat, 27 Jun 2026 16:00:12 +0000 (18:00 +0200)]
Move feature labeling code to its own module to be ready for a second connsumer in maplibres data layer

4 days agoFix one code duplication
Frank Elsinga [Sat, 27 Jun 2026 15:58:30 +0000 (17:58 +0200)]
Fix one code duplication

4 days agoMake sure to not use the space separated event listeners anywhere
Frank Elsinga [Sat, 27 Jun 2026 15:58:14 +0000 (17:58 +0200)]
Make sure to not use the space separated event listeners anywhere

6 days agoRemove secondary wiki prefix list
Marwin Hochfelsner [Fri, 5 Jun 2026 00:16:37 +0000 (00:16 +0000)]
Remove secondary wiki prefix list

6 days agoMerge remote-tracking branch 'upstream/pull/7177'
Tom Hughes [Thu, 25 Jun 2026 16:49:58 +0000 (17:49 +0100)]
Merge remote-tracking branch 'upstream/pull/7177'

6 days agoMerge pull request #7182 from openstreetmap/translatewiki
Marwin Hochfelsner [Thu, 25 Jun 2026 13:42:11 +0000 (15:42 +0200)]
Merge pull request #7182 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

6 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 Jun 2026 12:15:39 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

7 days agoMerge remote-tracking branch 'upstream/pull/7181'
Tom Hughes [Wed, 24 Jun 2026 23:28:53 +0000 (00:28 +0100)]
Merge remote-tracking branch 'upstream/pull/7181'

7 days agoMerge remote-tracking branch 'upstream/pull/7180'
Tom Hughes [Wed, 24 Jun 2026 23:28:40 +0000 (00:28 +0100)]
Merge remote-tracking branch 'upstream/pull/7180'

7 days agoMerge remote-tracking branch 'upstream/pull/7179'
Tom Hughes [Wed, 24 Jun 2026 23:28:05 +0000 (00:28 +0100)]
Merge remote-tracking branch 'upstream/pull/7179'

7 days agoMerge remote-tracking branch 'upstream/pull/7178'
Tom Hughes [Wed, 24 Jun 2026 23:28:00 +0000 (00:28 +0100)]
Merge remote-tracking branch 'upstream/pull/7178'

7 days agoBump the dependencies group with 2 updates
dependabot[bot] [Wed, 24 Jun 2026 23:16:03 +0000 (23:16 +0000)]
Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [doorkeeper-openid_connect](https://github.com/doorkeeper-gem/doorkeeper-openid_connect) and [cgi](https://github.com/ruby/cgi).

Updates `doorkeeper-openid_connect` from 1.10.1 to 1.10.3
- [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.10.1...v1.10.3)

Updates `cgi` from 0.5.1 to 0.5.2
- [Release notes](https://github.com/ruby/cgi/releases)
- [Commits](https://github.com/ruby/cgi/compare/v0.5.1...v0.5.2)

---
updated-dependencies:
- dependency-name: doorkeeper-openid_connect
  dependency-version: 1.10.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: cgi
  dependency-version: 0.5.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
7 days agoBump the rubocop group with 2 updates
dependabot[bot] [Wed, 24 Jun 2026 23:13:00 +0000 (23:13 +0000)]
Bump the rubocop group with 2 updates

Bumps the rubocop group with 2 updates: [rubocop-capybara](https://github.com/rubocop/rubocop-capybara) and [rubocop-rails](https://github.com/rubocop/rubocop-rails).

Updates `rubocop-capybara` from 2.23.0 to 3.0.0
- [Release notes](https://github.com/rubocop/rubocop-capybara/releases)
- [Changelog](https://github.com/rubocop/rubocop-capybara/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-capybara/compare/v2.23.0...v3.0.0)

Updates `rubocop-rails` from 2.35.4 to 2.35.5
- [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.35.4...v2.35.5)

---
updated-dependencies:
- dependency-name: rubocop-capybara
  dependency-version: 3.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: rubocop
- dependency-name: rubocop-rails
  dependency-version: 2.35.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: rubocop
...

Signed-off-by: dependabot[bot] <support@github.com>
7 days agoBump globals from 17.6.0 to 17.7.0 in the dependencies group
dependabot[bot] [Wed, 24 Jun 2026 23:13:00 +0000 (23:13 +0000)]
Bump globals from 17.6.0 to 17.7.0 in the dependencies group

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

Updates `globals` from 17.6.0 to 17.7.0
- [Release notes](https://github.com/sindresorhus/globals/releases)
- [Commits](https://github.com/sindresorhus/globals/compare/v17.6.0...v17.7.0)

---
updated-dependencies:
- dependency-name: globals
  dependency-version: 17.7.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
7 days agoBump the dependencies group with 2 updates
dependabot[bot] [Wed, 24 Jun 2026 23:12:29 +0000 (23:12 +0000)]
Bump the dependencies group with 2 updates

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

Updates `actions/checkout` from 6.0.3 to 7.0.0
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/df4cb1c069e1874edd31b4311f1884172cec0e10...9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0)

Updates `ruby/setup-ruby` from 1.313.0 to 1.314.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/89f90524b88a01fe6e0b732220432cc6142926af...9eb537ca036ebaed86729dcb9309076e4c5c3b74)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: ruby/setup-ruby
  dependency-version: 1.314.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
7 days agoKeep linkification regexps in memory
Pablo Brasero [Wed, 24 Jun 2026 12:23:42 +0000 (13:23 +0100)]
Keep linkification regexps in memory

I was playing with [derailed_benchmarks](https://github.com/zombocom/derailed_benchmarks) today and noticed that history pages were spending a long time in `Regexp#initialize`. Example:

```
$ PATH_TO_HIT=/node/29/history be derailed exec perf:stackprof
Booting: production
(...)
Method: GET
Endpoint: "/node/29/history"
(...)
==================================
  Mode: cpu(1000)
  Samples: 3716 (15.58% miss rate)
  GC: 343 (9.23%)
==================================
     TOTAL    (pct)     SAMPLES    (pct)     FRAME
       529  (14.2%)         529  (14.2%)     Regexp#initialize
       230   (6.2%)         230   (6.2%)     (marking)
       165   (4.4%)         165   (4.4%)     Dir.glob
       163   (4.4%)         163   (4.4%)     Zlib::Inflate#inflate
       113   (3.0%)         113   (3.0%)     (sweeping)
        88   (2.4%)          78   (2.1%)     String#gsub
(...)
```

Note that this is measured while running the app in production mode.

I went poking and saw that the [18 patterns (as of these lines)](https://github.com/openstreetmap/openstreetmap-website/blob/5053e2e76b82031b54cba71944d50128929459b7/config/settings.yml#L146-L182) used to detect text to linkify are being used to instantiate `Regexp` every time that linkification takes place. Looks like this takes a significant amount of time.

This PR moves the instantiation to a class method where the result is memoized. This is the result, for comparison:

```
$ PATH_TO_HIT=/node/29/history be derailed exec perf:stackprof
Booting: production
(...)
Method: GET
Endpoint: "/node/29/history"
(...)
==================================
  Mode: cpu(1000)
  Samples: 3521 (19.50% miss rate)
  GC: 329 (9.34%)
==================================
     TOTAL    (pct)     SAMPLES    (pct)     FRAME
       226   (6.4%)         226   (6.4%)     (marking)
       184   (5.2%)         184   (5.2%)     Zlib::Inflate#inflate
       131   (3.7%)         119   (3.4%)     String#gsub
       102   (2.9%)         102   (2.9%)     (sweeping)
        79   (2.2%)          67   (1.9%)     Set#initialize
        60   (1.7%)          60   (1.7%)     PG::Connection#exec_prepared
```

Or in terms of requests per second, this is the code currently in master:

```
$ PATH_TO_HIT=/node/29/history bundle exec derailed exec perf:ips
Booting: production
(...)
Database 'openstreetmap' already exists
Method: GET
Endpoint: "/node/29/history"
ruby 4.0.5 (2026-05-20 revision 64336ffd0e) +YJIT +PRISM [x86_64-linux]
Warming up --------------------------------------
                 ips     1.000 i/100ms
Calculating -------------------------------------
                 ips     23.713 (±25.3%) i/s   (42.17 ms/i) -    119.000 in   5.018360s
```

And this is this PR:

```
> PATH_TO_HIT=/node/29/history bundle exec derailed exec perf:ips
Booting: production
(...)
Method: GET
Endpoint: "/node/29/history"
ruby 4.0.5 (2026-05-20 revision 64336ffd0e) +YJIT +PRISM [x86_64-linux]
Warming up --------------------------------------
                 ips     1.000 i/100ms
Calculating -------------------------------------
                 ips     30.870 (±25.9%) i/s   (32.39 ms/i) -    155.000 in   5.021047s
```

So that's from ~24 ips to ~30 ips, or 25% more requests per second.

Caveat: the tests for `RichText` set up custom patterns, assuming no
memoization. To work around this, I have added a `RichText.reset_state`
method that is run before each relevant test.

7 days agoMerge remote-tracking branch 'upstream/pull/7176'
Tom Hughes [Wed, 24 Jun 2026 21:12:37 +0000 (22:12 +0100)]
Merge remote-tracking branch 'upstream/pull/7176'

7 days agoReorder stubbing calls
Marwin Hochfelsner [Wed, 24 Jun 2026 19:43:10 +0000 (21:43 +0200)]
Reorder stubbing calls

8 days agoMerge remote-tracking branch 'upstream/pull/6811'
Tom Hughes [Tue, 23 Jun 2026 19:39:03 +0000 (20:39 +0100)]
Merge remote-tracking branch 'upstream/pull/6811'

8 days agoMerge remote-tracking branch 'upstream/pull/7174'
Tom Hughes [Tue, 23 Jun 2026 19:22:58 +0000 (20:22 +0100)]
Merge remote-tracking branch 'upstream/pull/7174'

8 days agoRemove dangling top-level block
Marwin Hochfelsner [Mon, 22 Jun 2026 01:24:08 +0000 (03:24 +0200)]
Remove dangling top-level block

8 days agoRemove history submodules from OSM scope
Marwin Hochfelsner [Mon, 22 Jun 2026 01:14:21 +0000 (03:14 +0200)]
Remove history submodules from OSM scope

8 days agoRemove directions submodules from OSM scope
Marwin Hochfelsner [Mon, 22 Jun 2026 01:11:09 +0000 (03:11 +0200)]
Remove directions submodules from OSM scope

8 days agoCollapse OSM.Directions namespace
Marwin Hochfelsner [Mon, 22 Jun 2026 01:09:41 +0000 (03:09 +0200)]
Collapse OSM.Directions namespace

8 days agoRescope ContextMenu
Marwin Hochfelsner [Mon, 22 Jun 2026 01:03:21 +0000 (03:03 +0200)]
Rescope ContextMenu

8 days agoMerge pull request #7173 from tomhughes/module-includes
Marwin Hochfelsner [Tue, 23 Jun 2026 19:00:04 +0000 (21:00 +0200)]
Merge pull request #7173 from tomhughes/module-includes

Move module includes to group them with the modules that use them

8 days agoMove includes for directions module to index_modules
Tom Hughes [Tue, 23 Jun 2026 18:16:58 +0000 (19:16 +0100)]
Move includes for directions module to index_modules

8 days agoMove include for history module to index_modules
Tom Hughes [Tue, 23 Jun 2026 18:16:13 +0000 (19:16 +0100)]
Move include for history module to index_modules

8 days agoMerge remote-tracking branch 'upstream/pull/7147'
Tom Hughes [Tue, 23 Jun 2026 18:07:44 +0000 (19:07 +0100)]
Merge remote-tracking branch 'upstream/pull/7147'

8 days agoRemove jQuery throttle-debounce dependency
Marwin Hochfelsner [Fri, 13 Feb 2026 04:04:55 +0000 (05:04 +0100)]
Remove jQuery throttle-debounce dependency

8 days agoMerge remote-tracking branch 'upstream/pull/7172'
Tom Hughes [Tue, 23 Jun 2026 17:17:55 +0000 (18:17 +0100)]
Merge remote-tracking branch 'upstream/pull/7172'

8 days agoupdate iD to v2.41.1
Martin Raifer [Tue, 23 Jun 2026 15:21:06 +0000 (17:21 +0200)]
update iD to v2.41.1

8 days agoMerge remote-tracking branch 'upstream/pull/7171'
Tom Hughes [Tue, 23 Jun 2026 13:24:18 +0000 (14:24 +0100)]
Merge remote-tracking branch 'upstream/pull/7171'

8 days agoBump nokogiri from 1.19.3 to 1.19.4
dependabot[bot] [Tue, 23 Jun 2026 13:09:46 +0000 (13:09 +0000)]
Bump nokogiri from 1.19.3 to 1.19.4

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.19.3 to 1.19.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.19.3...v1.19.4)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-version: 1.19.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
9 days agoMigrate js controllers to lazy loaded modules
Marwin Hochfelsner [Mon, 22 Jun 2026 00:46:53 +0000 (02:46 +0200)]
Migrate js controllers to lazy loaded modules

9 days agoCollect initializations outside of modules
Marwin Hochfelsner [Tue, 9 Jun 2026 21:43:26 +0000 (21:43 +0000)]
Collect initializations outside of modules

9 days agoCollect module paths in dict
Marwin Hochfelsner [Tue, 9 Jun 2026 21:16:03 +0000 (21:16 +0000)]
Collect module paths in dict

9 days agoReduce redundancy in router navigation handling
Marwin Hochfelsner [Mon, 22 Jun 2026 16:37:52 +0000 (18:37 +0200)]
Reduce redundancy in router navigation handling

9 days agoMerge pull request #7170 from openstreetmap/translatewiki
Andy Allan [Mon, 22 Jun 2026 14:10:16 +0000 (15:10 +0100)]
Merge pull request #7170 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

9 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Jun 2026 12:16:30 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

10 days agoMerge remote-tracking branch 'upstream/pull/7169'
Tom Hughes [Sun, 21 Jun 2026 17:46:02 +0000 (18:46 +0100)]
Merge remote-tracking branch 'upstream/pull/7169'

10 days agoReplace marker shadow image with vector graphic
Marwin Hochfelsner [Sun, 21 Jun 2026 04:41:19 +0000 (06:41 +0200)]
Replace marker shadow image with vector graphic

13 days agoMerge pull request #7164 from openstreetmap/dependabot/bundler/dependencies-0493874874
Andy Allan [Thu, 18 Jun 2026 14:00:28 +0000 (15:00 +0100)]
Merge pull request #7164 from openstreetmap/dependabot/bundler/dependencies-0493874874

Bump the dependencies group with 6 updates

13 days agoMerge pull request #7166 from openstreetmap/translatewiki
Andy Allan [Thu, 18 Jun 2026 13:30:42 +0000 (14:30 +0100)]
Merge pull request #7166 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

13 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 18 Jun 2026 12:14:51 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.

2 weeks agoMerge pull request #7163 from openstreetmap/dependabot/npm_and_yarn/dependencies...
Marwin Hochfelsner [Wed, 17 Jun 2026 23:40:48 +0000 (01:40 +0200)]
Merge pull request #7163 from openstreetmap/dependabot/npm_and_yarn/dependencies-6d76de260b

Bump eslint from 10.4.1 to 10.5.0 in the dependencies group

2 weeks agoMerge pull request #7161 from openstreetmap/dependabot/github_actions/dependencies...
Marwin Hochfelsner [Wed, 17 Jun 2026 23:38:12 +0000 (01:38 +0200)]
Merge pull request #7161 from openstreetmap/dependabot/github_actions/dependencies-10722fb5c6

Bump ruby/setup-ruby from 1.312.0 to 1.313.0 in the dependencies group

2 weeks agoMerge pull request #7162 from openstreetmap/dependabot/bundler/rubocop-950b9b3410
Marwin Hochfelsner [Wed, 17 Jun 2026 23:37:52 +0000 (01:37 +0200)]
Merge pull request #7162 from openstreetmap/dependabot/bundler/rubocop-950b9b3410

Bump rubocop from 1.87.0 to 1.88.0 in the rubocop group

2 weeks agoMerge pull request #7157 from pnorman/svwd03
Marwin Hochfelsner [Wed, 17 Jun 2026 23:36:44 +0000 (01:36 +0200)]
Merge pull request #7157 from pnorman/svwd03

Switch from Versatiles Colorful to SVWD03

2 weeks agoBump the dependencies group with 6 updates
dependabot[bot] [Wed, 17 Jun 2026 23:16:58 +0000 (23:16 +0000)]
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.9.2` | `5.9.3` |
| [faraday](https://github.com/lostisland/faraday) | `2.14.2` | `2.14.3` |
| [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) | `1.225.1` | `1.226.0` |
| [danger](https://github.com/danger/danger) | `9.5.3` | `9.6.0` |
| [brakeman](https://github.com/presidentbeef/brakeman) | `8.0.4` | `8.0.5` |
| [selenium-webdriver](https://github.com/SeleniumHQ/selenium) | `4.44.0` | `4.45.0` |

Updates `doorkeeper` from 5.9.2 to 5.9.3
- [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.9.2...v5.9.3)

Updates `faraday` from 2.14.2 to 2.14.3
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v2.14.2...v2.14.3)

Updates `aws-sdk-s3` from 1.225.1 to 1.226.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 `danger` from 9.5.3 to 9.6.0
- [Release notes](https://github.com/danger/danger/releases)
- [Changelog](https://github.com/danger/danger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/danger/danger/compare/v9.5.3...v9.6.0)

Updates `brakeman` from 8.0.4 to 8.0.5
- [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/v8.0.4...v8.0.5)

Updates `selenium-webdriver` from 4.44.0 to 4.45.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.44.0...selenium-4.45.0)

---
updated-dependencies:
- dependency-name: doorkeeper
  dependency-version: 5.9.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: faraday
  dependency-version: 2.14.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.226.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: danger
  dependency-version: 9.6.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: brakeman
  dependency-version: 8.0.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: selenium-webdriver
  dependency-version: 4.45.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks agoBump eslint from 10.4.1 to 10.5.0 in the dependencies group
dependabot[bot] [Wed, 17 Jun 2026 23:13:06 +0000 (23:13 +0000)]
Bump eslint from 10.4.1 to 10.5.0 in the dependencies group

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

Updates `eslint` from 10.4.1 to 10.5.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v10.4.1...v10.5.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 10.5.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks agoBump rubocop from 1.87.0 to 1.88.0 in the rubocop group
dependabot[bot] [Wed, 17 Jun 2026 23:12:38 +0000 (23:12 +0000)]
Bump rubocop from 1.87.0 to 1.88.0 in the rubocop group

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

Updates `rubocop` from 1.87.0 to 1.88.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.87.0...v1.88.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks agoBump ruby/setup-ruby from 1.312.0 to 1.313.0 in the dependencies group
dependabot[bot] [Wed, 17 Jun 2026 23:12:28 +0000 (23:12 +0000)]
Bump ruby/setup-ruby from 1.312.0 to 1.313.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.312.0 to 1.313.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/12fd324f1d0b43274fdc8130f6980590a667c455...89f90524b88a01fe6e0b732220432cc6142926af)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks agoMerge pull request #7159 from tyrasd/iD-2.41.0
Marwin Hochfelsner [Tue, 16 Jun 2026 21:51:49 +0000 (23:51 +0200)]
Merge pull request #7159 from tyrasd/iD-2.41.0

update iD to v2.41.0

2 weeks agoupdate iD to v2.41.0
Martin Raifer [Mon, 15 Jun 2026 18:37:20 +0000 (20:37 +0200)]
update iD to v2.41.0

2 weeks agoMerge pull request #7158 from openstreetmap/translatewiki
Marwin Hochfelsner [Mon, 15 Jun 2026 17:54:34 +0000 (19:54 +0200)]
Merge pull request #7158 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

2 weeks agoMerge pull request #7132 from pablobm/display-note-error
Marwin Hochfelsner [Mon, 15 Jun 2026 15:49:28 +0000 (17:49 +0200)]
Merge pull request #7132 from pablobm/display-note-error

Display error message if note creation fails

2 weeks agoDisplay error message if note creation fails
Pablo Brasero [Thu, 28 May 2026 16:18:56 +0000 (17:18 +0100)]
Display error message if note creation fails

Co-authored-by: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
2 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 Jun 2026 12:16:51 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

2 weeks agoSwitch from Versatiles Colorful to SVWD03
Paul Norman [Sun, 14 Jun 2026 20:08:33 +0000 (13:08 -0700)]
Switch from Versatiles Colorful to SVWD03

The SVWD03 style shows off more of what Shortbread has.

2 weeks agoMerge pull request #7154 from pablobm/no-trigger-happy-autolinks
Marwin Hochfelsner [Fri, 12 Jun 2026 22:21:31 +0000 (00:21 +0200)]
Merge pull request #7154 from pablobm/no-trigger-happy-autolinks

Avoid autolink patterns that trigger too easily

2 weeks agoAvoid autolink patterns that trigger too easily
Pablo Brasero [Thu, 11 Jun 2026 19:58:01 +0000 (20:58 +0100)]
Avoid autolink patterns that trigger too easily

2 weeks agoMerge remote-tracking branch 'upstream/pull/7153'
Tom Hughes [Thu, 11 Jun 2026 17:17:55 +0000 (18:17 +0100)]
Merge remote-tracking branch 'upstream/pull/7153'

2 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 11 Jun 2026 12:18:08 +0000 (14:18 +0200)]
Localisation updates from https://translatewiki.net.

3 weeks agoMerge remote-tracking branch 'upstream/pull/7152'
Tom Hughes [Wed, 10 Jun 2026 23:47:42 +0000 (00:47 +0100)]
Merge remote-tracking branch 'upstream/pull/7152'

3 weeks agoMerge remote-tracking branch 'upstream/pull/7149'
Tom Hughes [Wed, 10 Jun 2026 23:47:27 +0000 (00:47 +0100)]
Merge remote-tracking branch 'upstream/pull/7149'

3 weeks agoMerge pull request #7151 from openstreetmap/dependabot/npm_and_yarn/dependencies...
Marwin Hochfelsner [Wed, 10 Jun 2026 23:27:01 +0000 (01:27 +0200)]
Merge pull request #7151 from openstreetmap/dependabot/npm_and_yarn/dependencies-859d0a6eda

Bump @types/jquery from 4.0.0 to 4.0.1 in the dependencies group

3 weeks agoMerge pull request #7150 from openstreetmap/dependabot/bundler/rubocop-45d2eb50df
Marwin Hochfelsner [Wed, 10 Jun 2026 23:26:41 +0000 (01:26 +0200)]
Merge pull request #7150 from openstreetmap/dependabot/bundler/rubocop-45d2eb50df

Bump rubocop-rails from 2.35.3 to 2.35.4 in the rubocop group

3 weeks agoBump the dependencies group with 4 updates
dependabot[bot] [Wed, 10 Jun 2026 23:17:02 +0000 (23:17 +0000)]
Bump the dependencies group with 4 updates

Bumps the dependencies group with 4 updates: [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper), [doorkeeper-i18n](https://github.com/doorkeeper-gem/doorkeeper-i18n), [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) and [overcommit](https://github.com/sds/overcommit).

Updates `doorkeeper` from 5.9.1 to 5.9.2
- [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.9.1...v5.9.2)

Updates `doorkeeper-i18n` from 5.2.8 to 5.2.9
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper-i18n/releases)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper-i18n/commits/v5.2.9)

Updates `aws-sdk-s3` from 1.225.0 to 1.225.1
- [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 `overcommit` from 0.70.0 to 0.71.0
- [Release notes](https://github.com/sds/overcommit/releases)
- [Changelog](https://github.com/sds/overcommit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sds/overcommit/compare/v0.70.0...v0.71.0)

---
updated-dependencies:
- dependency-name: doorkeeper
  dependency-version: 5.9.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: doorkeeper-i18n
  dependency-version: 5.2.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: aws-sdk-s3
  dependency-version: 1.225.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: overcommit
  dependency-version: 0.71.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
3 weeks agoBump @types/jquery from 4.0.0 to 4.0.1 in the dependencies group
dependabot[bot] [Wed, 10 Jun 2026 23:13:14 +0000 (23:13 +0000)]
Bump @types/jquery from 4.0.0 to 4.0.1 in the dependencies group

Bumps the dependencies group with 1 update: [@types/jquery](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jquery).

Updates `@types/jquery` from 4.0.0 to 4.0.1
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jquery)

---
updated-dependencies:
- dependency-name: "@types/jquery"
  dependency-version: 4.0.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
3 weeks agoBump rubocop-rails from 2.35.3 to 2.35.4 in the rubocop group
dependabot[bot] [Wed, 10 Jun 2026 23:12:51 +0000 (23:12 +0000)]
Bump rubocop-rails from 2.35.3 to 2.35.4 in the rubocop group

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

Updates `rubocop-rails` from 2.35.3 to 2.35.4
- [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.35.3...v2.35.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
3 weeks agoBump ruby/setup-ruby from 1.310.0 to 1.312.0 in the dependencies group
dependabot[bot] [Wed, 10 Jun 2026 23:12:41 +0000 (23:12 +0000)]
Bump ruby/setup-ruby from 1.310.0 to 1.312.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.310.0 to 1.312.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/afeafc3d1ab54a631816aba4c914a0081c12ff2f...12fd324f1d0b43274fdc8130f6980590a667c455)

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

Signed-off-by: dependabot[bot] <support@github.com>
3 weeks agoMerge remote-tracking branch 'upstream/pull/7145'
Tom Hughes [Tue, 9 Jun 2026 18:57:07 +0000 (19:57 +0100)]
Merge remote-tracking branch 'upstream/pull/7145'

3 weeks agoBump net-imap from 0.6.4 to 0.6.4.1
dependabot[bot] [Tue, 9 Jun 2026 18:47:36 +0000 (18:47 +0000)]
Bump net-imap from 0.6.4 to 0.6.4.1

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.6.4 to 0.6.4.1.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.6.4...v0.6.4.1)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-version: 0.6.4.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
3 weeks agoMerge remote-tracking branch 'upstream/pull/7138'
Tom Hughes [Tue, 9 Jun 2026 18:04:09 +0000 (19:04 +0100)]
Merge remote-tracking branch 'upstream/pull/7138'

3 weeks agoAdd query parameter that to suppress display of signup UI elements
Simon Poole [Sun, 7 Jun 2026 10:00:57 +0000 (10:00 +0000)]
Add query parameter that to suppress display of signup UI elements

This adds support for a query paramater "allow_signup" that will
suppress the rendering of signup UI elements during the OAuth2
authorisation flow.

This is the same solution as github implements for their "webflow"
OAuth2 process.

Resolves https://github.com/openstreetmap/openstreetmap-website/issues/5118

3 weeks agoMerge pull request #7144 from tomhughes/js-minimise
Andy Allan [Tue, 9 Jun 2026 16:30:09 +0000 (17:30 +0100)]
Merge pull request #7144 from tomhughes/js-minimise

Restore javascript minimisation in production