]> git.openstreetmap.org Git - rails.git/log
rails.git
13 days agoMerge remote-tracking branch 'upstream/pull/5726'
Tom Hughes [Mon, 24 Feb 2025 17:11:58 +0000 (17:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5726'

13 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 24 Feb 2025 12:15:17 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

2 weeks agoMerge branch 'pull/5715'
Anton Khorev [Sun, 23 Feb 2025 23:15:24 +0000 (02:15 +0300)]
Merge branch 'pull/5715'

2 weeks agoRemove unnecessary RuboCop exclusion
Anton Khorev [Sun, 23 Feb 2025 02:34:48 +0000 (05:34 +0300)]
Remove unnecessary RuboCop exclusion

2 weeks agoTest api changeset comment hide/unhide at legacy routes
Anton Khorev [Sun, 23 Feb 2025 03:45:52 +0000 (06:45 +0300)]
Test api changeset comment hide/unhide at legacy routes

2 weeks agoRefactor api changeset comment visibility json tests
Anton Khorev [Sun, 23 Feb 2025 03:38:43 +0000 (06:38 +0300)]
Refactor api changeset comment visibility json tests

2 weeks agoRefactor api changeset comment visibility xml tests
Anton Khorev [Sun, 23 Feb 2025 03:04:20 +0000 (06:04 +0300)]
Refactor api changeset comment visibility xml tests

2 weeks agoCreate api changeset comment visibility resource
Anton Khorev [Sun, 23 Feb 2025 01:59:26 +0000 (04:59 +0300)]
Create api changeset comment visibility resource

2 weeks agoTest response body of changeset comment hide/unhide
Anton Khorev [Sun, 23 Feb 2025 01:54:39 +0000 (04:54 +0300)]
Test response body of changeset comment hide/unhide

2 weeks agoMerge remote-tracking branch 'upstream/pull/5725'
Tom Hughes [Sun, 23 Feb 2025 20:34:42 +0000 (20:34 +0000)]
Merge remote-tracking branch 'upstream/pull/5725'

2 weeks agoAllow cross-origin access to active storage endpoints
Tom Hughes [Sun, 23 Feb 2025 19:48:04 +0000 (19:48 +0000)]
Allow cross-origin access to active storage endpoints

Fixes #5639

2 weeks agoMake changeset comment create action resourceful
Anton Khorev [Sat, 22 Feb 2025 23:46:38 +0000 (02:46 +0300)]
Make changeset comment create action resourceful

2 weeks agoMerge remote-tracking branch 'upstream/pull/5724'
Tom Hughes [Sun, 23 Feb 2025 18:59:18 +0000 (18:59 +0000)]
Merge remote-tracking branch 'upstream/pull/5724'

2 weeks agoAdd show_redactions param to changeset downloads
Anton Khorev [Sat, 22 Feb 2025 19:08:45 +0000 (22:08 +0300)]
Add show_redactions param to changeset downloads

2 weeks agoMerge remote-tracking branch 'upstream/pull/5721'
Tom Hughes [Sun, 23 Feb 2025 11:12:43 +0000 (11:12 +0000)]
Merge remote-tracking branch 'upstream/pull/5721'

2 weeks agoRewrite changeset download show test
Anton Khorev [Thu, 20 Feb 2025 03:29:24 +0000 (06:29 +0300)]
Rewrite changeset download show test

2 weeks agoCreate api changeset download resource
Anton Khorev [Thu, 20 Feb 2025 00:41:04 +0000 (03:41 +0300)]
Create api changeset download resource

2 weeks agoMerge branch 'pull/5719'
Anton Khorev [Sat, 22 Feb 2025 17:33:48 +0000 (20:33 +0300)]
Merge branch 'pull/5719'

2 weeks agoExtend user list to allow searching by name or email
Tom Hughes [Sat, 22 Feb 2025 11:40:58 +0000 (11:40 +0000)]
Extend user list to allow searching by name or email

2 weeks agoCheck user searches find the right users
Tom Hughes [Sat, 22 Feb 2025 11:36:37 +0000 (11:36 +0000)]
Check user searches find the right users

2 weeks agoMerge remote-tracking branch 'upstream/pull/5717'
Tom Hughes [Sat, 22 Feb 2025 11:11:36 +0000 (11:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5717'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5718'
Tom Hughes [Sat, 22 Feb 2025 11:10:25 +0000 (11:10 +0000)]
Merge remote-tracking branch 'upstream/pull/5718'

2 weeks agoBump eslint from 9.20.1 to 9.21.0
dependabot[bot] [Fri, 21 Feb 2025 23:41:15 +0000 (23:41 +0000)]
Bump eslint from 9.20.1 to 9.21.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.20.1 to 9.21.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.20.1...v9.21.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks agoMake api changeset show path resourceful
Anton Khorev [Wed, 19 Feb 2025 23:34:51 +0000 (02:34 +0300)]
Make api changeset show path resourceful

2 weeks agoUpdate minimum ruby version to 3.2
Tom Hughes [Fri, 21 Feb 2025 19:22:43 +0000 (19:22 +0000)]
Update minimum ruby version to 3.2

2 weeks agoMerge remote-tracking branch 'upstream/pull/5712'
Tom Hughes [Fri, 21 Feb 2025 18:00:06 +0000 (18:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5712'

2 weeks agoImproves note's unit test with the latest dropping
Nenad Vujicic [Fri, 21 Feb 2025 12:06:17 +0000 (13:06 +0100)]
Improves note's unit test with the latest dropping

Improves note's unit test test_read_note_suspended_opener_and_comment by specifying "commented" type to second note comment (by default "opened") to support the latest dropping displaying notes comments.

2 weeks agoImproves notes_description helper routine
Nenad Vujicic [Wed, 19 Feb 2025 15:07:45 +0000 (16:07 +0100)]
Improves notes_description helper routine

Improves notes_description helper routine to return "unknown" for cases when first note's comment doesn't have event set to "opened" or note doesn't have comments. Added new argument (note's first comment), also updated helper routines usages.

2 weeks agoSplit engine translations
Marwin Hochfelsner [Thu, 20 Feb 2025 11:47:06 +0000 (12:47 +0100)]
Split engine translations

2 weeks agoSplit engine id into mode and provider
Marwin Hochfelsner [Mon, 17 Feb 2025 14:57:56 +0000 (15:57 +0100)]
Split engine id into mode and provider

2 weeks agoImproves dropping of first note's comment
Nenad Vujicic [Wed, 19 Feb 2025 15:10:10 +0000 (16:10 +0100)]
Improves dropping of first note's comment

Improves calculating comments to be displayed by dropping first comment only if it is opening.

2 weeks agoImproves behavior if note lacks opening comment
Nenad Vujicic [Wed, 19 Feb 2025 14:59:09 +0000 (15:59 +0100)]
Improves behavior if note lacks opening comment

Adds checking if note lacks opening comment and if positive, returns nil for both note's author and description.

2 weeks agoMerge remote-tracking branch 'upstream/pull/5694'
Tom Hughes [Thu, 20 Feb 2025 22:08:02 +0000 (22:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5694'

2 weeks agoImprove download link translation
Marwin Hochfelsner [Thu, 20 Feb 2025 20:17:50 +0000 (21:17 +0100)]
Improve download link translation

Can be squashed with main commit

2 weeks agoMerge remote-tracking branch 'upstream/pull/5713'
Tom Hughes [Thu, 20 Feb 2025 17:10:00 +0000 (17:10 +0000)]
Merge remote-tracking branch 'upstream/pull/5713'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5711'
Tom Hughes [Thu, 20 Feb 2025 16:56:49 +0000 (16:56 +0000)]
Merge remote-tracking branch 'upstream/pull/5711'

2 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 20 Feb 2025 12:18:06 +0000 (13:18 +0100)]
Localisation updates from https://translatewiki.net.

2 weeks agoMake api changeset index path resourceful
Anton Khorev [Wed, 12 Feb 2025 00:10:54 +0000 (03:10 +0300)]
Make api changeset index path resourceful

2 weeks agoMove api changeset index tests up
Anton Khorev [Wed, 12 Feb 2025 00:04:12 +0000 (03:04 +0300)]
Move api changeset index tests up

2 weeks agoMake api create changeset path resourceful
Anton Khorev [Tue, 11 Feb 2025 23:59:46 +0000 (02:59 +0300)]
Make api create changeset path resourceful

2 weeks agoSet zoom in id iframe data
Marwin Hochfelsner [Wed, 19 Feb 2025 20:29:15 +0000 (21:29 +0100)]
Set zoom in id iframe data

2 weeks agoMerge remote-tracking branch 'upstream/pull/5702'
Tom Hughes [Wed, 19 Feb 2025 18:10:22 +0000 (18:10 +0000)]
Merge remote-tracking branch 'upstream/pull/5702'

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

2 weeks agoMerge remote-tracking branch 'upstream/pull/5703'
Tom Hughes [Wed, 19 Feb 2025 18:06:55 +0000 (18:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5703'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5710'
Tom Hughes [Wed, 19 Feb 2025 18:01:52 +0000 (18:01 +0000)]
Merge remote-tracking branch 'upstream/pull/5710'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5709'
Tom Hughes [Wed, 19 Feb 2025 17:59:17 +0000 (17:59 +0000)]
Merge remote-tracking branch 'upstream/pull/5709'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5707'
Tom Hughes [Wed, 19 Feb 2025 17:58:24 +0000 (17:58 +0000)]
Merge remote-tracking branch 'upstream/pull/5707'

2 weeks agoAssociate search input with route destination instead of departure
Marwin Hochfelsner [Fri, 14 Feb 2025 09:36:27 +0000 (10:36 +0100)]
Associate search input with route destination instead of departure

2 weeks agoBump nokogiri from 1.18.2 to 1.18.3
dependabot[bot] [Wed, 19 Feb 2025 13:22:12 +0000 (13:22 +0000)]
Bump nokogiri from 1.18.2 to 1.18.3

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.18.2 to 1.18.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.18.3/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.18.2...v1.18.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks agoMigrate eslint config to esmodules
Holger Jeromin [Wed, 19 Feb 2025 08:44:40 +0000 (09:44 +0100)]
Migrate eslint config to esmodules

And upgrade `@stylistic/eslint-plugin-js` to `4.0.x`

closes #5704

2 weeks agoCenter secondary nav
Marwin Hochfelsner [Wed, 19 Feb 2025 04:03:37 +0000 (05:03 +0100)]
Center secondary nav

2 weeks agoRemove current user check from dashboard view
Anton Khorev [Wed, 19 Feb 2025 00:59:38 +0000 (03:59 +0300)]
Remove current user check from dashboard view

2 weeks agoInitialize dashboard followings and nearby users in controller
Anton Khorev [Wed, 19 Feb 2025 00:53:29 +0000 (03:53 +0300)]
Initialize dashboard followings and nearby users in controller

2 weeks agoAdd xml changeset tags test
Anton Khorev [Tue, 18 Feb 2025 23:22:59 +0000 (02:22 +0300)]
Add xml changeset tags test

2 weeks agoConvert json changeset tags and comments test to tags test
Anton Khorev [Mon, 17 Feb 2025 02:04:46 +0000 (05:04 +0300)]
Convert json changeset tags and comments test to tags test

There are other tests that check comments.

2 weeks agoFix rubocop warnings
Tom Hughes [Tue, 18 Feb 2025 20:25:55 +0000 (20:25 +0000)]
Fix rubocop warnings

2 weeks agoAvoid modifying constant strings
Tom Hughes [Tue, 18 Feb 2025 20:14:01 +0000 (20:14 +0000)]
Avoid modifying constant strings

This fixes a ruby 3.4 warning about strings that will
be frozen by default in a future release.

2 weeks agoAvoid redefining object_id method
Tom Hughes [Tue, 18 Feb 2025 20:13:31 +0000 (20:13 +0000)]
Avoid redefining object_id method

This fixes a ruby 3.4 warning.

2 weeks agoMerge remote-tracking branch 'upstream/pull/5700'
Tom Hughes [Tue, 18 Feb 2025 18:35:31 +0000 (18:35 +0000)]
Merge remote-tracking branch 'upstream/pull/5700'

2 weeks agoUpdate rubocop confguration for plugins
Tom Hughes [Tue, 18 Feb 2025 18:20:15 +0000 (18:20 +0000)]
Update rubocop confguration for plugins

Move plugins which support it to the new plugins clause.

2 weeks agoDrop workaround for #2472 that is no longer required
Tom Hughes [Tue, 18 Feb 2025 18:19:55 +0000 (18:19 +0000)]
Drop workaround for #2472 that is no longer required

2 weeks agoUpdate bundle
Tom Hughes [Tue, 18 Feb 2025 18:10:06 +0000 (18:10 +0000)]
Update bundle

2 weeks agoPre-center objects with embed-data
Marwin Hochfelsner [Mon, 17 Feb 2025 23:16:19 +0000 (00:16 +0100)]
Pre-center objects with embed-data

2 weeks agoMerge remote-tracking branch 'upstream/pull/5699'
Tom Hughes [Mon, 17 Feb 2025 22:37:52 +0000 (22:37 +0000)]
Merge remote-tracking branch 'upstream/pull/5699'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5696'
Tom Hughes [Mon, 17 Feb 2025 20:30:04 +0000 (20:30 +0000)]
Merge remote-tracking branch 'upstream/pull/5696'

2 weeks agoMove edit account action to show
Anton Khorev [Sun, 16 Feb 2025 23:35:09 +0000 (02:35 +0300)]
Move edit account action to show

2 weeks agoTest account destroy route
Anton Khorev [Sun, 16 Feb 2025 23:20:24 +0000 (02:20 +0300)]
Test account destroy route

2 weeks agoUse follow_redirect! in account update tests
Anton Khorev [Sun, 16 Feb 2025 23:19:09 +0000 (02:19 +0300)]
Use follow_redirect! in account update tests

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

2 weeks agoAdd jquery editor support
Holger Jeromin [Mon, 17 Feb 2025 11:16:13 +0000 (12:16 +0100)]
Add jquery editor support

At least vscode (derivates) provide first class intellisense support out of the box with that.

2 weeks agoEnable exporting direction paths
Marwin Hochfelsner [Sun, 16 Feb 2025 16:08:37 +0000 (17:08 +0100)]
Enable exporting direction paths

3 weeks agoCopies description, user_id and user_ip to notes
Nenad Vujicic [Mon, 20 Jan 2025 11:58:51 +0000 (12:58 +0100)]
Copies description, user_id and user_ip to notes

Adds migration script for copying description, user_id and user_ip from first note's comment to notes table.

3 weeks agoMerge remote-tracking branch 'upstream/pull/3767'
Tom Hughes [Mon, 17 Feb 2025 08:57:17 +0000 (08:57 +0000)]
Merge remote-tracking branch 'upstream/pull/3767'

3 weeks agoMerge remote-tracking branch 'upstream/pull/5656'
Tom Hughes [Mon, 17 Feb 2025 08:34:13 +0000 (08:34 +0000)]
Merge remote-tracking branch 'upstream/pull/5656'

3 weeks agoMerge remote-tracking branch 'upstream/pull/5697'
Tom Hughes [Mon, 17 Feb 2025 08:30:39 +0000 (08:30 +0000)]
Merge remote-tracking branch 'upstream/pull/5697'

3 weeks agoAlways check changes/comments counts in single changeset tests
Anton Khorev [Mon, 17 Feb 2025 01:38:51 +0000 (04:38 +0300)]
Always check changes/comments counts in single changeset tests

3 weeks agoRemove unnecessary RuboCop exclusion
Anton Khorev [Tue, 11 Feb 2025 04:21:28 +0000 (07:21 +0300)]
Remove unnecessary RuboCop exclusion

3 weeks agoRemove unused redaction code from api old elements controller
Anton Khorev [Tue, 11 Feb 2025 04:18:01 +0000 (07:18 +0300)]
Remove unused redaction code from api old elements controller

3 weeks agoCreate relation version redaction resource
Anton Khorev [Tue, 11 Feb 2025 04:04:19 +0000 (07:04 +0300)]
Create relation version redaction resource

3 weeks agoCreate way version redaction resource
Anton Khorev [Tue, 11 Feb 2025 03:43:09 +0000 (06:43 +0300)]
Create way version redaction resource

3 weeks agoCreate node version redaction resource
Anton Khorev [Tue, 11 Feb 2025 01:33:27 +0000 (04:33 +0300)]
Create node version redaction resource

3 weeks agoAdd base old element redactions controller
Anton Khorev [Tue, 11 Feb 2025 01:30:35 +0000 (04:30 +0300)]
Add base old element redactions controller

3 weeks agoReturn promise from sendRemoteEditCommand()
Anton Khorev [Fri, 20 Dec 2024 12:43:46 +0000 (15:43 +0300)]
Return promise from sendRemoteEditCommand()

3 weeks agoDon't display error messages when second scheduled rc command fails
Anton Khorev [Tue, 25 Oct 2022 08:45:43 +0000 (11:45 +0300)]
Don't display error messages when second scheduled rc command fails

3 weeks agoMerge remote-tracking branch 'upstream/pull/5695'
Tom Hughes [Sun, 16 Feb 2025 16:36:40 +0000 (16:36 +0000)]
Merge remote-tracking branch 'upstream/pull/5695'

3 weeks agoRemove some unnecessary calls to clear the mail queue
Andy Allan [Sun, 16 Feb 2025 16:02:01 +0000 (16:02 +0000)]
Remove some unnecessary calls to clear the mail queue

These were not needed at the end of most tests for quite some time,
since rails clears them by default for controller and integration tests,
and also no longer required in system tests after #5691

3 weeks agoMerge pull request #5692 from tomhughes/ubuntu-latest
Andy Allan [Sun, 16 Feb 2025 16:13:38 +0000 (16:13 +0000)]
Merge pull request #5692 from tomhughes/ubuntu-latest

Use ubuntu-latest for all workflows

3 weeks agoMerge remote-tracking branch 'upstream/pull/5693'
Tom Hughes [Sun, 16 Feb 2025 15:52:05 +0000 (15:52 +0000)]
Merge remote-tracking branch 'upstream/pull/5693'

3 weeks agoTest map panning when visiting changeset and note comment links
Anton Khorev [Sun, 16 Feb 2025 15:00:44 +0000 (18:00 +0300)]
Test map panning when visiting changeset and note comment links

3 weeks agoUse ubuntu-latest for all workflows
Tom Hughes [Sun, 16 Feb 2025 14:58:03 +0000 (14:58 +0000)]
Use ubuntu-latest for all workflows

There's generally no point running on multiple versions as
the important things like ruby are note the OS versions in any
case and production runs on Debian now not Ubuntu.

3 weeks agoUse setup-node action to install node modules
Tom Hughes [Sun, 16 Feb 2025 15:19:14 +0000 (15:19 +0000)]
Use setup-node action to install node modules

3 weeks agoMerge pull request #5691 from tomhughes/system-test-clear-deliveries
Andy Allan [Sun, 16 Feb 2025 14:50:04 +0000 (14:50 +0000)]
Merge pull request #5691 from tomhughes/system-test-clear-deliveries

Clear test deliveries before and after system tests

3 weeks agoMerge pull request #5690 from tomhughes/ruby34
Andy Allan [Sun, 16 Feb 2025 14:48:26 +0000 (14:48 +0000)]
Merge pull request #5690 from tomhughes/ruby34

Add ruby 3.4 to test matrix

3 weeks agoClear test deliveries before and after system tests
Tom Hughes [Sun, 16 Feb 2025 14:32:58 +0000 (14:32 +0000)]
Clear test deliveries before and after system tests

Fixes #5687

3 weeks agoMerge pull request #5688 from tomhughes/spam-check-report
Andy Allan [Sun, 16 Feb 2025 14:19:45 +0000 (14:19 +0000)]
Merge pull request #5688 from tomhughes/spam-check-report

Make reports trigger a spam check on the reported user

3 weeks agoMerge pull request #5689 from tomhughes/settings-fixes
Andy Allan [Sun, 16 Feb 2025 14:17:44 +0000 (14:17 +0000)]
Merge pull request #5689 from tomhughes/settings-fixes

User settings fixes

3 weeks agoMake reports trigger a spam check on the reported user
Tom Hughes [Sun, 16 Feb 2025 13:34:12 +0000 (13:34 +0000)]
Make reports trigger a spam check on the reported user

3 weeks agoOnly count reports from distinct users in spam checks
Tom Hughes [Sun, 16 Feb 2025 14:06:46 +0000 (14:06 +0000)]
Only count reports from distinct users in spam checks

3 weeks agoMove errors from email to new_email properly
Tom Hughes [Wed, 1 Jan 2025 12:27:05 +0000 (12:27 +0000)]
Move errors from email to new_email properly

3 weeks agoReplace count.zero? with empty?
Tom Hughes [Wed, 1 Jan 2025 12:11:22 +0000 (12:11 +0000)]
Replace count.zero? with empty?