]> git.openstreetmap.org Git - rails.git/log
rails.git
5 months 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

5 months 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'

5 months 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.

5 months 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.

5 months 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.

5 months 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.

5 months 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'

5 months 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

5 months 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'

5 months 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'

5 months 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.

5 months 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

5 months 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

5 months 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

5 months 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

5 months 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'

5 months 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'

5 months 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'

5 months 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'

5 months 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'

5 months 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'

5 months 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

5 months 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>
5 months 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

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

5 months 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

5 months 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

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

5 months 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.

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

5 months 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.

5 months 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.

5 months 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'

5 months 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.

5 months 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

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

5 months 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

5 months 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'

5 months 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'

5 months 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

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

5 months 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

5 months 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.

5 months 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.

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

5 months 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'

5 months 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'

5 months 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'

5 months 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

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

5 months 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

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

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

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

5 months 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

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

5 months 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

5 months 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'

5 months 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

5 months 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

5 months 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'

5 months 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

5 months 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.

5 months 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

5 months 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

5 months 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

5 months 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

5 months 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

5 months 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

5 months 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

5 months 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

5 months 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

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

5 months agoAdd ruby 3.4 to test matrix
Tom Hughes [Sun, 16 Feb 2025 13:47:05 +0000 (13:47 +0000)]
Add ruby 3.4 to test matrix

5 months agoMerge remote-tracking branch 'upstream/pull/5685'
Tom Hughes [Sun, 16 Feb 2025 13:18:14 +0000 (13:18 +0000)]
Merge remote-tracking branch 'upstream/pull/5685'

5 months agoMerge remote-tracking branch 'upstream/pull/5278'
Tom Hughes [Sun, 16 Feb 2025 13:11:45 +0000 (13:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5278'

5 months agoMerge pull request #5676 from tomhughes/spam-score-reports
Andy Allan [Sun, 16 Feb 2025 11:51:52 +0000 (11:51 +0000)]
Merge pull request #5676 from tomhughes/spam-score-reports

Include spam reports on unresolved issues in the spam score

5 months agoMerge pull request #5558 from tomhughes/var-let-const
Andy Allan [Sun, 16 Feb 2025 11:48:17 +0000 (11:48 +0000)]
Merge pull request #5558 from tomhughes/var-let-const

Replace var in javascript with let/const

5 months agoReplace uses of var with let or const as appropriate
Tom Hughes [Sun, 26 Jan 2025 19:06:27 +0000 (19:06 +0000)]
Replace uses of var with let or const as appropriate

5 months agoUpdate eslint to prefer let/const over var
Tom Hughes [Sun, 26 Jan 2025 19:05:56 +0000 (19:05 +0000)]
Update eslint to prefer let/const over var

5 months agoMerge remote-tracking branch 'upstream/pull/5686'
Tom Hughes [Sun, 16 Feb 2025 11:12:47 +0000 (11:12 +0000)]
Merge remote-tracking branch 'upstream/pull/5686'

5 months agodon't pan map wen closing/reopening/commenting a note, fixes #648
Martin Raifer [Sun, 16 Feb 2025 09:55:54 +0000 (10:55 +0100)]
don't pan map wen closing/reopening/commenting a note, fixes #648

5 months agodon't re-pan the map when selecting another note that is already on the screen
Martin Raifer [Sun, 16 Feb 2025 09:36:00 +0000 (10:36 +0100)]
don't re-pan the map when selecting another note that is already on the screen

fixes a regression in #5679

5 months agoMerge remote-tracking branch 'upstream/pull/4359'
Tom Hughes [Sun, 16 Feb 2025 09:04:17 +0000 (09:04 +0000)]
Merge remote-tracking branch 'upstream/pull/4359'

5 months agoMerge remote-tracking branch 'upstream/pull/5684'
Tom Hughes [Sun, 16 Feb 2025 08:34:14 +0000 (08:34 +0000)]
Merge remote-tracking branch 'upstream/pull/5684'

5 months agoMove OAuth requests to fetch
Marwin Hochfelsner [Sat, 15 Feb 2025 22:21:39 +0000 (23:21 +0100)]
Move OAuth requests to fetch

5 months agoAdd option to use headless Firefox in system tests
Anton Khorev [Fri, 14 Feb 2025 17:02:22 +0000 (20:02 +0300)]
Add option to use headless Firefox in system tests

5 months agoMerge pull request #5677 from tomhughes/user-list-enhancements
Andy Allan [Sat, 15 Feb 2025 17:37:48 +0000 (17:37 +0000)]
Merge pull request #5677 from tomhughes/user-list-enhancements

User list enhancements

5 months agoMerge remote-tracking branch 'upstream/pull/5681'
Tom Hughes [Sat, 15 Feb 2025 17:36:29 +0000 (17:36 +0000)]
Merge remote-tracking branch 'upstream/pull/5681'

5 months agoMerge remote-tracking branch 'upstream/pull/5680'
Tom Hughes [Sat, 15 Feb 2025 17:35:49 +0000 (17:35 +0000)]
Merge remote-tracking branch 'upstream/pull/5680'

5 months agoUse title case consistently for nav tab labels
Andy Allan [Sat, 15 Feb 2025 16:48:04 +0000 (16:48 +0000)]
Use title case consistently for nav tab labels

5 months agoMerge remote-tracking branch 'upstream/pull/4926'
Tom Hughes [Sat, 15 Feb 2025 17:07:59 +0000 (17:07 +0000)]
Merge remote-tracking branch 'upstream/pull/4926'

5 months agoUse 'My Account' for account pages
Andy Allan [Sat, 15 Feb 2025 14:57:16 +0000 (14:57 +0000)]
Use 'My Account' for account pages

It's hard to make a distinction between 'Preferences' and 'Settings' in some languages,
and many other sites use the term 'Account' for things like changing email.

5 months agoMerge branch 'pull/5678'
Anton Khorev [Sat, 15 Feb 2025 17:03:42 +0000 (20:03 +0300)]
Merge branch 'pull/5678'

5 months agoMerge remote-tracking branch 'upstream/pull/4301'
Tom Hughes [Sat, 15 Feb 2025 16:42:53 +0000 (16:42 +0000)]
Merge remote-tracking branch 'upstream/pull/4301'

5 months agoAdd changeset comment search api json format
Anton Khorev [Tue, 21 Nov 2023 15:56:41 +0000 (18:56 +0300)]
Add changeset comment search api json format

5 months agoAdd changeset comment search api with filtering by author and time
Anton Khorev [Thu, 16 Nov 2023 07:03:26 +0000 (10:03 +0300)]
Add changeset comment search api with filtering by author and time

5 months agoMerge remote-tracking branch 'upstream/pull/5131'
Tom Hughes [Sat, 15 Feb 2025 16:31:12 +0000 (16:31 +0000)]
Merge remote-tracking branch 'upstream/pull/5131'

5 months agoAdd user block api call
Anton Khorev [Fri, 20 Oct 2023 10:07:42 +0000 (13:07 +0300)]
Add user block api call

5 months agoMerge remote-tracking branch 'upstream/pull/5679'
Tom Hughes [Sat, 15 Feb 2025 16:16:37 +0000 (16:16 +0000)]
Merge remote-tracking branch 'upstream/pull/5679'