]> git.openstreetmap.org Git - rails.git/log
rails.git
38 hours agoUpdate bundle master
Tom Hughes [Tue, 1 Apr 2025 12:25:25 +0000 (13:25 +0100)]
Update bundle

2 days agoMerge branch 'pull/5865'
Anton Khorev [Mon, 31 Mar 2025 21:19:04 +0000 (00:19 +0300)]
Merge branch 'pull/5865'

2 days agoMerge remote-tracking branch 'upstream/pull/5860'
Tom Hughes [Mon, 31 Mar 2025 09:49:28 +0000 (10:49 +0100)]
Merge remote-tracking branch 'upstream/pull/5860'

2 days agoPropagate iD title to parent
Marwin Hochfelsner [Sun, 30 Mar 2025 06:09:37 +0000 (08:09 +0200)]
Propagate iD title to parent

3 days agoMerge remote-tracking branch 'upstream/pull/5857'
Tom Hughes [Sun, 30 Mar 2025 17:41:00 +0000 (18:41 +0100)]
Merge remote-tracking branch 'upstream/pull/5857'

3 days agoMerge remote-tracking branch 'upstream/pull/5867'
Tom Hughes [Sun, 30 Mar 2025 17:40:45 +0000 (18:40 +0100)]
Merge remote-tracking branch 'upstream/pull/5867'

3 days agoRevert "Replace differently sized arrows with a marker"
Anton Khorev [Sun, 30 Mar 2025 17:00:58 +0000 (20:00 +0300)]
Revert "Replace differently sized arrows with a marker"

This reverts commit ba876975e4fcda29cf84b319772874a5d32add78.

3 days agoMerge remote-tracking branch 'upstream/pull/5866'
Tom Hughes [Sun, 30 Mar 2025 13:33:00 +0000 (14:33 +0100)]
Merge remote-tracking branch 'upstream/pull/5866'

3 days agoReplace differently sized arrows with a marker
Marwin Hochfelsner [Sun, 30 Mar 2025 09:03:56 +0000 (11:03 +0200)]
Replace differently sized arrows with a marker

3 days agoConsolidate leaflet marker creation in OSM.getMarker
Marwin Hochfelsner [Fri, 28 Mar 2025 07:18:50 +0000 (08:18 +0100)]
Consolidate leaflet marker creation in OSM.getMarker

5 days agoUpdate the title_followed string according to code review comment
Amir E. Aharoni [Fri, 28 Mar 2025 17:22:44 +0000 (13:22 -0400)]
Update the title_followed string according to code review comment

5 days agoMerge remote-tracking branch 'upstream/pull/5858'
Tom Hughes [Fri, 28 Mar 2025 16:59:38 +0000 (16:59 +0000)]
Merge remote-tracking branch 'upstream/pull/5858'

6 days agoRemove /wiki prefix from wiki urls in linkify
Anton Khorev [Fri, 28 Mar 2025 02:45:16 +0000 (05:45 +0300)]
Remove /wiki prefix from wiki urls in linkify

6 days agoUpdate tests with "Followings"
Amir E. Aharoni [Thu, 27 Mar 2025 18:22:31 +0000 (14:22 -0400)]
Update tests with "Followings"

6 days agoRephrase strings with the word "followings"
Amir E. Aharoni [Thu, 27 Mar 2025 18:02:34 +0000 (14:02 -0400)]
Rephrase strings with the word "followings"

See issue #5856.

6 days agoMerge remote-tracking branch 'upstream/pull/5850' live
Tom Hughes [Thu, 27 Mar 2025 17:30:12 +0000 (17:30 +0000)]
Merge remote-tracking branch 'upstream/pull/5850'

6 days agoMerge remote-tracking branch 'upstream/pull/5855'
Tom Hughes [Thu, 27 Mar 2025 17:27:40 +0000 (17:27 +0000)]
Merge remote-tracking branch 'upstream/pull/5855'

6 days agoMerge remote-tracking branch 'upstream/pull/5852'
Tom Hughes [Thu, 27 Mar 2025 17:23:38 +0000 (17:23 +0000)]
Merge remote-tracking branch 'upstream/pull/5852'

6 days agoShorten matching wiki urls in linkify
Anton Khorev [Thu, 27 Mar 2025 14:23:12 +0000 (17:23 +0300)]
Shorten matching wiki urls in linkify

6 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 27 Mar 2025 12:15:47 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

6 days agoMerge pull request #5849 from AntonKhorev/fix-github-badges
Andy Allan [Thu, 27 Mar 2025 09:03:15 +0000 (09:03 +0000)]
Merge pull request #5849 from AntonKhorev/fix-github-badges

Fix GitHub badges in readme

7 days agoRemove extra sanitize after simple_format RichText::HTML
Anton Khorev [Thu, 27 Mar 2025 01:29:31 +0000 (04:29 +0300)]
Remove extra sanitize after simple_format RichText::HTML

simple_format already calls sanitize internally. We don't call sanitize again from a similar place of RichText::Text.

7 days agoRemove TagHelper include from RichText module
Anton Khorev [Thu, 27 Mar 2025 00:47:32 +0000 (03:47 +0300)]
Remove TagHelper include from RichText module

7 days agoFix GitHub badges in readme
Anton Khorev [Wed, 26 Mar 2025 23:51:10 +0000 (02:51 +0300)]
Fix GitHub badges in readme

7 days agoMerge remote-tracking branch 'upstream/pull/5842'
Tom Hughes [Wed, 26 Mar 2025 18:23:27 +0000 (18:23 +0000)]
Merge remote-tracking branch 'upstream/pull/5842'

7 days agoMerge pull request #5848 from tomhughes/test-migrations
Andy Allan [Wed, 26 Mar 2025 16:52:03 +0000 (16:52 +0000)]
Merge pull request #5848 from tomhughes/test-migrations

Test migrations

7 days agoCorrect structure.sql
Tom Hughes [Wed, 26 Mar 2025 16:11:10 +0000 (16:11 +0000)]
Correct structure.sql

7 days agoRemove structure.sql to force a migration
Tom Hughes [Wed, 26 Mar 2025 15:59:43 +0000 (15:59 +0000)]
Remove structure.sql to force a migration

Fixes #5847

7 days agoMerge remote-tracking branch 'upstream/pull/5846'
Tom Hughes [Wed, 26 Mar 2025 16:04:51 +0000 (16:04 +0000)]
Merge remote-tracking branch 'upstream/pull/5846'

7 days agoUpdate strong_migrations to be compatible with rails 8
Andy Allan [Wed, 26 Mar 2025 15:09:43 +0000 (15:09 +0000)]
Update strong_migrations to be compatible with rails 8

We previously pinned to an old version for ruby 3.1 support, but
that's no longer required since rails needs 3.2 anyway.

Fixes #5845

8 days agoFix lock file
Tom Hughes [Tue, 25 Mar 2025 20:43:11 +0000 (20:43 +0000)]
Fix lock file

8 days agoPin uri as dartsass-ruby doesn't work with 1.x
Tom Hughes [Tue, 25 Mar 2025 20:39:52 +0000 (20:39 +0000)]
Pin uri as dartsass-ruby doesn't work with 1.x

8 days agoMerge remote-tracking branch 'upstream/pull/4872'
Tom Hughes [Tue, 25 Mar 2025 19:15:47 +0000 (19:15 +0000)]
Merge remote-tracking branch 'upstream/pull/4872'

8 days agoMerge remote-tracking branch 'upstream/pull/5844'
Tom Hughes [Tue, 25 Mar 2025 19:09:44 +0000 (19:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5844'

8 days agoMerge remote-tracking branch 'upstream/pull/5843'
Tom Hughes [Tue, 25 Mar 2025 18:18:20 +0000 (18:18 +0000)]
Merge remote-tracking branch 'upstream/pull/5843'

8 days agoUpdate bundle
Tom Hughes [Tue, 25 Mar 2025 18:09:39 +0000 (18:09 +0000)]
Update bundle

8 days agoShorten matching urls in linkify
Anton Khorev [Tue, 25 Mar 2025 01:04:46 +0000 (04:04 +0300)]
Shorten matching urls in linkify

9 days agoSplit RichText text-to-html test
Anton Khorev [Tue, 25 Mar 2025 02:36:00 +0000 (05:36 +0300)]
Split RichText text-to-html test

9 days agoBump @types/leaflet from 1.9.16 to 1.9.17
dependabot[bot] [Tue, 25 Mar 2025 01:39:19 +0000 (01:39 +0000)]
Bump @types/leaflet from 1.9.16 to 1.9.17

Bumps [@types/leaflet](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/leaflet) from 1.9.16 to 1.9.17.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/leaflet)

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

Signed-off-by: dependabot[bot] <support@github.com>
9 days agoRemove html-safe/unsafe branches from rich text linkify
Anton Khorev [Mon, 24 Mar 2025 12:51:26 +0000 (15:51 +0300)]
Remove html-safe/unsafe branches from rich text linkify

Rinku outputs html. It would make no sense to escape Rinku's output, the output should be safe when it's created. To make sure that it's safe, we need to escape the input. As it is currently used in osm-website, the input is already html-safe and escaping does nothing. However it's safer to escape anyway in case the future usage changes.

9 days agoMerge branch 'pull/5841'
Anton Khorev [Tue, 25 Mar 2025 00:38:31 +0000 (03:38 +0300)]
Merge branch 'pull/5841'

9 days agoFix "undefined" comment when hiding resolved notes
Anton Khorev [Tue, 25 Mar 2025 00:21:58 +0000 (03:21 +0300)]
Fix "undefined" comment when hiding resolved notes

9 days agoFix typo in comment about Gravatar setting
Mateusz [Mon, 24 Mar 2025 23:57:55 +0000 (00:57 +0100)]
Fix typo in comment about Gravatar setting

9 days agoRe-enable support for logging to a file in production
Tom Hughes [Mon, 24 Mar 2025 17:36:42 +0000 (17:36 +0000)]
Re-enable support for logging to a file in production

9 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 24 Mar 2025 12:14:23 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

10 days agoMerge remote-tracking branch 'upstream/pull/5826'
Tom Hughes [Sun, 23 Mar 2025 19:42:27 +0000 (19:42 +0000)]
Merge remote-tracking branch 'upstream/pull/5826'

10 days agoRemove params from url when viewing place history and map is moved
Anton Khorev [Mon, 17 Mar 2025 00:21:46 +0000 (03:21 +0300)]
Remove params from url when viewing place history and map is moved

10 days agoRename changeset loader functions
Anton Khorev [Sun, 16 Mar 2025 23:46:05 +0000 (02:46 +0300)]
Rename changeset loader functions

10 days agoScroll to first/last changeset in history list if before/after param is given
Anton Khorev [Sun, 16 Mar 2025 23:07:50 +0000 (02:07 +0300)]
Scroll to first/last changeset in history list if before/after param is given

10 days agoRewrite history page url when scrolling
Anton Khorev [Sun, 16 Mar 2025 14:59:49 +0000 (17:59 +0300)]
Rewrite history page url when scrolling

10 days agoMerge remote-tracking branch 'upstream/pull/5839'
Tom Hughes [Sun, 23 Mar 2025 16:34:53 +0000 (16:34 +0000)]
Merge remote-tracking branch 'upstream/pull/5839'

10 days agoRemove unused options argument from user_image_url
Anton Khorev [Sun, 23 Mar 2025 16:15:06 +0000 (19:15 +0300)]
Remove unused options argument from user_image_url

10 days agoMerge remote-tracking branch 'upstream/pull/5835'
Tom Hughes [Sun, 23 Mar 2025 16:14:13 +0000 (16:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5835'

10 days agoadd dir="auto" to paragraphs of formatted text
Nitai Sasson [Fri, 21 Mar 2025 19:37:46 +0000 (21:37 +0200)]
add dir="auto" to paragraphs of formatted text

10 days agoMerge remote-tracking branch 'upstream/pull/5837'
Tom Hughes [Sun, 23 Mar 2025 10:40:40 +0000 (10:40 +0000)]
Merge remote-tracking branch 'upstream/pull/5837'

10 days agoMerge remote-tracking branch 'upstream/pull/5836'
Tom Hughes [Sun, 23 Mar 2025 10:26:06 +0000 (10:26 +0000)]
Merge remote-tracking branch 'upstream/pull/5836'

11 days agoPut note comments in <article> elements
Anton Khorev [Sat, 22 Mar 2025 23:21:10 +0000 (02:21 +0300)]
Put note comments in <article> elements

11 days agoPut changeset comments in <article> elements
Anton Khorev [Sat, 22 Mar 2025 23:02:50 +0000 (02:02 +0300)]
Put changeset comments in <article> elements

12 days agoBump eslint from 9.22.0 to 9.23.0
dependabot[bot] [Fri, 21 Mar 2025 23:55:59 +0000 (23:55 +0000)]
Bump eslint from 9.22.0 to 9.23.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.22.0 to 9.23.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.22.0...v9.23.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
12 days agoMerge remote-tracking branch 'upstream/pull/5834'
Tom Hughes [Fri, 21 Mar 2025 17:44:37 +0000 (17:44 +0000)]
Merge remote-tracking branch 'upstream/pull/5834'

12 days agoMerge remote-tracking branch 'upstream/pull/5830'
Tom Hughes [Fri, 21 Mar 2025 17:32:44 +0000 (17:32 +0000)]
Merge remote-tracking branch 'upstream/pull/5830'

12 days agoMerge branch 'pull/5833'
Anton Khorev [Fri, 21 Mar 2025 14:27:22 +0000 (17:27 +0300)]
Merge branch 'pull/5833'

12 days agoChange heatmap color to sqrt from 0 to max changes
Holger Jeromin [Fri, 21 Mar 2025 08:41:26 +0000 (09:41 +0100)]
Change heatmap color to sqrt from 0 to max changes

12 days agoUse Date().toLocaleString() to construct month titles
Anton Khorev [Fri, 21 Mar 2025 12:59:02 +0000 (15:59 +0300)]
Use Date().toLocaleString() to construct month titles

Ensures that standalone month names are in the nominative case.

13 days agoCreate map key resource
Anton Khorev [Thu, 20 Mar 2025 23:40:31 +0000 (02:40 +0300)]
Create map key resource

13 days agoMerge remote-tracking branch 'upstream/pull/5825'
Tom Hughes [Thu, 20 Mar 2025 17:09:57 +0000 (17:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5825'

13 days agoMerge remote-tracking branch 'upstream/pull/5828'
Tom Hughes [Thu, 20 Mar 2025 16:53:11 +0000 (16:53 +0000)]
Merge remote-tracking branch 'upstream/pull/5828'

13 days agoMerge remote-tracking branch 'upstream/pull/5827'
Tom Hughes [Thu, 20 Mar 2025 16:32:21 +0000 (16:32 +0000)]
Merge remote-tracking branch 'upstream/pull/5827'

13 days agoReuse mirrored turn icons
Anton Khorev [Thu, 20 Mar 2025 16:21:00 +0000 (19:21 +0300)]
Reuse mirrored turn icons

Co-authored-by: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
13 days agoUpdate straight routing in tests to use named directions icons
Anton Khorev [Thu, 20 Mar 2025 15:25:15 +0000 (18:25 +0300)]
Update straight routing in tests to use named directions icons

13 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 20 Mar 2025 12:14:34 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

13 days agoMerge pull request #5430 from tomhughes/rails8
Andy Allan [Thu, 20 Mar 2025 11:55:11 +0000 (11:55 +0000)]
Merge pull request #5430 from tomhughes/rails8

Update to rails 8

13 days agoUse rails 8 compatible active_record_union
Tom Hughes [Fri, 20 Dec 2024 10:26:47 +0000 (10:26 +0000)]
Use rails 8 compatible active_record_union

https://github.com/brianhempel/active_record_union/issues/36

13 days agoAvoid parsing of XML requests with ; in the body
Tom Hughes [Fri, 20 Dec 2024 10:18:12 +0000 (10:18 +0000)]
Avoid parsing of XML requests with ; in the body

13 days agoReplace permit/require with expect for parameter validation
Tom Hughes [Tue, 25 Feb 2025 19:08:57 +0000 (19:08 +0000)]
Replace permit/require with expect for parameter validation

13 days agoUpdate to rails 8.0.2
Tom Hughes [Tue, 19 Nov 2024 20:25:58 +0000 (20:25 +0000)]
Update to rails 8.0.2

2 weeks agoUse search params without objectification
Marwin Hochfelsner [Wed, 19 Mar 2025 22:08:20 +0000 (23:08 +0100)]
Use search params without objectification

2 weeks agoAdd default value for parseHash
Marwin Hochfelsner [Wed, 19 Mar 2025 21:21:54 +0000 (22:21 +0100)]
Add default value for parseHash

2 weeks agoMerge remote-tracking branch 'upstream/pull/5824'
Tom Hughes [Wed, 19 Mar 2025 19:19:09 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/pull/5824'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5823'
Tom Hughes [Wed, 19 Mar 2025 18:51:54 +0000 (18:51 +0000)]
Merge remote-tracking branch 'upstream/pull/5823'

2 weeks agoAdd reload on iframe redirect
Marwin Hochfelsner [Wed, 19 Mar 2025 18:34:57 +0000 (19:34 +0100)]
Add reload on iframe redirect

2 weeks agoMerge remote-tracking branch 'upstream/pull/5823'
Tom Hughes [Wed, 19 Mar 2025 18:47:57 +0000 (18:47 +0000)]
Merge remote-tracking branch 'upstream/pull/5823'

2 weeks agoAdd reload on iframe redirect
Marwin Hochfelsner [Wed, 19 Mar 2025 18:34:57 +0000 (19:34 +0100)]
Add reload on iframe redirect

2 weeks agoMerge remote-tracking branch 'upstream/pull/5812'
Tom Hughes [Wed, 19 Mar 2025 17:47:53 +0000 (17:47 +0000)]
Merge remote-tracking branch 'upstream/pull/5812'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5818'
Tom Hughes [Wed, 19 Mar 2025 17:42:21 +0000 (17:42 +0000)]
Merge remote-tracking branch 'upstream/pull/5818'

2 weeks agoGet current locale correctly in routing engines
Tom Hughes [Wed, 19 Mar 2025 17:36:59 +0000 (17:36 +0000)]
Get current locale correctly in routing engines

Fixes #5821.

2 weeks agoMerge pull request #5820 from tomhughes/port-zero
Andy Allan [Wed, 19 Mar 2025 16:22:40 +0000 (16:22 +0000)]
Merge pull request #5820 from tomhughes/port-zero

Switch to dynamic allocation for the Firefox bidi port

2 weeks agoSwitch to dynamic allocation for the Firefox bidi port
Tom Hughes [Wed, 19 Mar 2025 08:27:15 +0000 (08:27 +0000)]
Switch to dynamic allocation for the Firefox bidi port

2 weeks agoupdate-wiki-pages: process ChangesetKey template
Kyle Hensel [Tue, 18 Mar 2025 09:11:19 +0000 (20:11 +1100)]
update-wiki-pages: process ChangesetKey template

2 weeks agoMake URLs more relative
Marwin Hochfelsner [Wed, 19 Mar 2025 04:44:04 +0000 (05:44 +0100)]
Make URLs more relative

2 weeks agoFix new rubocop warnings
Tom Hughes [Tue, 18 Mar 2025 18:21:40 +0000 (18:21 +0000)]
Fix new rubocop warnings

2 weeks agoUpdate bundle
Tom Hughes [Tue, 18 Mar 2025 18:17:24 +0000 (18:17 +0000)]
Update bundle

2 weeks agoMerge branch 'pull/5811'
Anton Khorev [Tue, 18 Mar 2025 00:48:52 +0000 (03:48 +0300)]
Merge branch 'pull/5811'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5817'
Tom Hughes [Mon, 17 Mar 2025 17:29:50 +0000 (17:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5817'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5814'
Tom Hughes [Mon, 17 Mar 2025 17:29:44 +0000 (17:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5814'

2 weeks agoUpdate to i18n-js 4.x
Tom Hughes [Sun, 16 Mar 2025 16:16:22 +0000 (16:16 +0000)]
Update to i18n-js 4.x

2 weeks agoReplace use of I18n in javascript with OSM.i18n
Tom Hughes [Sun, 16 Mar 2025 16:16:22 +0000 (16:16 +0000)]
Replace use of I18n in javascript with OSM.i18n

2 weeks agoAdd OSM.i18n as an alias for I18n
Tom Hughes [Sun, 16 Mar 2025 18:44:35 +0000 (18:44 +0000)]
Add OSM.i18n as an alias for I18n

2 weeks agoMove directions form buttons closer to edges
Anton Khorev [Mon, 17 Mar 2025 16:34:34 +0000 (19:34 +0300)]
Move directions form buttons closer to edges

- Adds more space between Close and Reverse buttons.
- Places Close button exactly above Sidebar Close button.

2 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 Mar 2025 12:14:31 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.