]> git.openstreetmap.org Git - rails.git/log
rails.git
9 days agoMerge remote-tracking branch 'upstream/pull/5650'
Tom Hughes [Wed, 12 Feb 2025 17:55:26 +0000 (17:55 +0000)]
Merge remote-tracking branch 'upstream/pull/5650'

9 days agoAdds storing note's properties to notes
Nenad Vujicic [Fri, 17 Jan 2025 16:29:00 +0000 (17:29 +0100)]
Adds storing note's properties to notes

Adds storing note's description, author_id and author_ip to notes table too when creating new note.

9 days agoMerge pull request #5658 from tomhughes/flash-skip-terms
Andy Allan [Wed, 12 Feb 2025 09:40:16 +0000 (09:40 +0000)]
Merge pull request #5658 from tomhughes/flash-skip-terms

Stop using session flash to communicate with callbacks

9 days agoMerge pull request #5659 from SergeCroise/patch-1
Andy Allan [Wed, 12 Feb 2025 09:34:17 +0000 (09:34 +0000)]
Merge pull request #5659 from SergeCroise/patch-1

Fix spelling of the word available in DOCKER md

10 days agoFix spelling of the word available in DOCKER md
Serge Croisé [Wed, 12 Feb 2025 01:04:44 +0000 (02:04 +0100)]
Fix spelling of the word available in DOCKER md

10 days agoMerge remote-tracking branch 'upstream/pull/5657'
Tom Hughes [Wed, 12 Feb 2025 00:18:25 +0000 (00:18 +0000)]
Merge remote-tracking branch 'upstream/pull/5657'

10 days agoStop using session flash to communicate with callbacks
Tom Hughes [Wed, 12 Feb 2025 00:03:32 +0000 (00:03 +0000)]
Stop using session flash to communicate with callbacks

10 days agoBump eslint from 9.20.0 to 9.20.1
dependabot[bot] [Tue, 11 Feb 2025 23:57:08 +0000 (23:57 +0000)]
Bump eslint from 9.20.0 to 9.20.1

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

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

Signed-off-by: dependabot[bot] <support@github.com>
10 days agoMerge remote-tracking branch 'upstream/pull/5649'
Tom Hughes [Tue, 11 Feb 2025 22:15:54 +0000 (22:15 +0000)]
Merge remote-tracking branch 'upstream/pull/5649'

10 days agoMerge remote-tracking branch 'upstream/pull/5655'
Tom Hughes [Tue, 11 Feb 2025 17:55:27 +0000 (17:55 +0000)]
Merge remote-tracking branch 'upstream/pull/5655'

10 days agoMerge remote-tracking branch 'upstream/pull/5653'
Tom Hughes [Tue, 11 Feb 2025 17:54:19 +0000 (17:54 +0000)]
Merge remote-tracking branch 'upstream/pull/5653'

10 days agoMerge remote-tracking branch 'upstream/pull/5637'
Tom Hughes [Tue, 11 Feb 2025 17:53:00 +0000 (17:53 +0000)]
Merge remote-tracking branch 'upstream/pull/5637'

10 days agoMerge remote-tracking branch 'upstream/pull/5648'
Tom Hughes [Tue, 11 Feb 2025 17:47:17 +0000 (17:47 +0000)]
Merge remote-tracking branch 'upstream/pull/5648'

10 days agoUpdate bundle
Tom Hughes [Tue, 11 Feb 2025 17:40:54 +0000 (17:40 +0000)]
Update bundle

10 days agoAdded prefix for busways in en.yml
Will Berg [Tue, 11 Feb 2025 16:37:55 +0000 (11:37 -0500)]
Added prefix for busways in en.yml

10 days agoeslint: Move file config to eslint section
Holger Jeromin [Tue, 11 Feb 2025 10:08:33 +0000 (11:08 +0100)]
eslint: Move file config to eslint section

10 days agoMerge remote-tracking branch 'upstream/pull/5651'
Tom Hughes [Tue, 11 Feb 2025 09:48:43 +0000 (09:48 +0000)]
Merge remote-tracking branch 'upstream/pull/5651'

10 days agoForce only big objects in eslint configuration to be sorted
Marwin Hochfelsner [Tue, 11 Feb 2025 09:21:35 +0000 (10:21 +0100)]
Force only big objects in eslint configuration to be sorted

11 days agoMake user creation code in unredact test similar to redact tests
Anton Khorev [Tue, 11 Feb 2025 04:10:54 +0000 (07:10 +0300)]
Make user creation code in unredact test similar to redact tests

11 days agoMove current version redaction tests above roles/scopes tests
Anton Khorev [Tue, 11 Feb 2025 02:41:18 +0000 (05:41 +0300)]
Move current version redaction tests above roles/scopes tests

11 days agoTest states of old elements after unsuccessful redactions
Anton Khorev [Mon, 10 Feb 2025 16:31:29 +0000 (19:31 +0300)]
Test states of old elements after unsuccessful redactions

11 days agoBump @stylistic/eslint-plugin-js from 3.0.1 to 3.1.0
dependabot[bot] [Mon, 10 Feb 2025 23:31:26 +0000 (23:31 +0000)]
Bump @stylistic/eslint-plugin-js from 3.0.1 to 3.1.0

Bumps [@stylistic/eslint-plugin-js](https://github.com/eslint-stylistic/eslint-stylistic/tree/HEAD/packages/eslint-plugin-js) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/eslint-stylistic/eslint-stylistic/releases)
- [Changelog](https://github.com/eslint-stylistic/eslint-stylistic/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint-stylistic/eslint-stylistic/commits/v3.1.0/packages/eslint-plugin-js)

---
updated-dependencies:
- dependency-name: "@stylistic/eslint-plugin-js"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
11 days agoRename old element variables in redaction tests
Anton Khorev [Mon, 10 Feb 2025 15:59:18 +0000 (18:59 +0300)]
Rename old element variables in redaction tests

11 days agoCheck old element state instead of responses in unredaction tests
Anton Khorev [Mon, 10 Feb 2025 15:44:05 +0000 (18:44 +0300)]
Check old element state instead of responses in unredaction tests

11 days agoUse fewer element versions in redaction tests
Anton Khorev [Mon, 10 Feb 2025 14:58:46 +0000 (17:58 +0300)]
Use fewer element versions in redaction tests

11 days agoRemove do_redact_element methods from api old element redaction tests
Anton Khorev [Mon, 10 Feb 2025 14:41:33 +0000 (17:41 +0300)]
Remove do_redact_element methods from api old element redaction tests

11 days agoTest api old element show accessed as moderator
Anton Khorev [Sun, 9 Feb 2025 15:50:48 +0000 (18:50 +0300)]
Test api old element show accessed as moderator

11 days agoAdd show_redactions checks to api old element show tests
Anton Khorev [Sun, 9 Feb 2025 15:38:22 +0000 (18:38 +0300)]
Add show_redactions checks to api old element show tests

11 days agoTest api old element index accessed as moderator
Anton Khorev [Sun, 9 Feb 2025 15:27:01 +0000 (18:27 +0300)]
Test api old element index accessed as moderator

11 days agoTest redacted element state after redaction action
Anton Khorev [Sun, 9 Feb 2025 15:18:25 +0000 (18:18 +0300)]
Test redacted element state after redaction action

11 days agoAdd show_redactions checks to api old element index tests
Anton Khorev [Sun, 9 Feb 2025 15:04:18 +0000 (18:04 +0300)]
Add show_redactions checks to api old element index tests

11 days agoSplit api old element redacted show tests
Anton Khorev [Sun, 9 Feb 2025 03:58:52 +0000 (06:58 +0300)]
Split api old element redacted show tests

11 days agoSplit api old element redacted index tests
Anton Khorev [Sun, 9 Feb 2025 03:44:10 +0000 (06:44 +0300)]
Split api old element redacted index tests

11 days agoMerge remote-tracking branch 'upstream/pull/5643'
Tom Hughes [Mon, 10 Feb 2025 20:13:37 +0000 (20:13 +0000)]
Merge remote-tracking branch 'upstream/pull/5643'

11 days agoMerge remote-tracking branch 'upstream/pull/5645'
Tom Hughes [Mon, 10 Feb 2025 20:11:55 +0000 (20:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5645'

11 days agoRemove unused api old relation test code
Anton Khorev [Sun, 9 Feb 2025 00:50:23 +0000 (03:50 +0300)]
Remove unused api old relation test code

11 days agoTest api old way show action without integration
Anton Khorev [Sun, 9 Feb 2025 00:27:17 +0000 (03:27 +0300)]
Test api old way show action without integration

11 days agoMove api way version test to integration tests
Anton Khorev [Sun, 9 Feb 2025 00:19:11 +0000 (03:19 +0300)]
Move api way version test to integration tests

11 days agoTest api old node show action without integration
Anton Khorev [Sun, 9 Feb 2025 00:31:18 +0000 (03:31 +0300)]
Test api old node show action without integration

11 days agoMove api node version test to integration tests
Anton Khorev [Sun, 9 Feb 2025 00:30:24 +0000 (03:30 +0300)]
Move api node version test to integration tests

11 days agoEnable a few linting rules
Marwin Hochfelsner [Mon, 10 Feb 2025 16:15:45 +0000 (17:15 +0100)]
Enable a few linting rules

11 days agoReplace abbreviation with for example in CONTRIBUTING md
Serge Croisé [Mon, 10 Feb 2025 18:56:51 +0000 (19:56 +0100)]
Replace abbreviation with for example in CONTRIBUTING md

11 days agoMerge remote-tracking branch 'upstream/pull/5403'
Tom Hughes [Mon, 10 Feb 2025 18:54:14 +0000 (18:54 +0000)]
Merge remote-tracking branch 'upstream/pull/5403'

11 days agoMerge remote-tracking branch 'upstream/pull/5641'
Tom Hughes [Mon, 10 Feb 2025 18:41:39 +0000 (18:41 +0000)]
Merge remote-tracking branch 'upstream/pull/5641'

11 days agoMerge remote-tracking branch 'upstream/pull/5644'
Tom Hughes [Mon, 10 Feb 2025 18:21:50 +0000 (18:21 +0000)]
Merge remote-tracking branch 'upstream/pull/5644'

11 days agoBump net-imap from 0.5.5 to 0.5.6
dependabot[bot] [Mon, 10 Feb 2025 18:01:29 +0000 (18:01 +0000)]
Bump net-imap from 0.5.5 to 0.5.6

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.5.5 to 0.5.6.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.5.5...v0.5.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
11 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 10 Feb 2025 12:13:59 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

12 days agoMake api old element show paths resourceful
Anton Khorev [Sat, 8 Feb 2025 17:29:15 +0000 (20:29 +0300)]
Make api old element show paths resourceful

12 days agoMerge branch 'pull/5636'
Anton Khorev [Sun, 9 Feb 2025 22:26:12 +0000 (01:26 +0300)]
Merge branch 'pull/5636'

12 days agoMerge branch 'pull/5640'
Anton Khorev [Sun, 9 Feb 2025 20:37:57 +0000 (23:37 +0300)]
Merge branch 'pull/5640'

12 days agoMove eslint ignore rules to the configuration file
Tom Hughes [Sun, 9 Feb 2025 19:35:19 +0000 (19:35 +0000)]
Move eslint ignore rules to the configuration file

Instead of having the rake task select which files to check, just
check the whole tree and have eslint ignore third party files and
generated files that we don't control.

12 days agoEnable sort-keys for eslint.js
Marwin Hochfelsner [Sun, 9 Feb 2025 19:08:43 +0000 (20:08 +0100)]
Enable sort-keys for eslint.js

12 days agoMerge remote-tracking branch 'upstream/pull/5638'
Tom Hughes [Sun, 9 Feb 2025 19:11:32 +0000 (19:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5638'

12 days agoConvert api element history actions to versions resources
Anton Khorev [Wed, 5 Feb 2025 14:39:26 +0000 (17:39 +0300)]
Convert api element history actions to versions resources

12 days agoFix grammar and punctuation in CONTRIBUTING md
Serge Croisé [Sun, 9 Feb 2025 15:57:49 +0000 (16:57 +0100)]
Fix grammar and punctuation in CONTRIBUTING md

12 days agoUse subqueries to find nested members more efficiently
Tom Hughes [Sun, 9 Feb 2025 15:40:49 +0000 (15:40 +0000)]
Use subqueries to find nested members more efficiently

12 days agoMerge remote-tracking branch 'upstream/pull/5633'
Tom Hughes [Sun, 9 Feb 2025 15:09:45 +0000 (15:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5633'

12 days agoMerge remote-tracking branch 'upstream/pull/5626'
Tom Hughes [Sun, 9 Feb 2025 15:02:14 +0000 (15:02 +0000)]
Merge remote-tracking branch 'upstream/pull/5626'

12 days agoMerge remote-tracking branch 'upstream/pull/5634'
Tom Hughes [Sun, 9 Feb 2025 14:51:56 +0000 (14:51 +0000)]
Merge remote-tracking branch 'upstream/pull/5634'

12 days agoFurther usage of URLSearchParams
Marwin Hochfelsner [Fri, 7 Feb 2025 08:37:22 +0000 (09:37 +0100)]
Further usage of URLSearchParams

13 days agoRemove IE<10 workaround
Marwin Hochfelsner [Sat, 8 Feb 2025 10:45:53 +0000 (11:45 +0100)]
Remove IE<10 workaround

13 days agoLessen code repetition
Marwin Hochfelsner [Sat, 8 Feb 2025 10:44:24 +0000 (11:44 +0100)]
Lessen code repetition

13 days agoReduce condition complexity
Marwin Hochfelsner [Sat, 8 Feb 2025 10:43:54 +0000 (11:43 +0100)]
Reduce condition complexity

13 days agoMerge branch 'pull/5631'
Anton Khorev [Sat, 8 Feb 2025 23:04:42 +0000 (02:04 +0300)]
Merge branch 'pull/5631'

13 days agoMerge remote-tracking branch 'upstream/pull/5621'
Tom Hughes [Sat, 8 Feb 2025 17:35:45 +0000 (17:35 +0000)]
Merge remote-tracking branch 'upstream/pull/5621'

13 days agoMerge remote-tracking branch 'upstream/pull/5611'
Tom Hughes [Sat, 8 Feb 2025 17:03:43 +0000 (17:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5611'

13 days agoDrop eslint initialiser
Tom Hughes [Sat, 8 Feb 2025 17:00:13 +0000 (17:00 +0000)]
Drop eslint initialiser

This was presumably required at some point but the i18n files seem
to pass eslint fine now and even if they didn't it would probably be
better to ignore them in the eslint config.

13 days agoMerge remote-tracking branch 'upstream/pull/5630'
Tom Hughes [Sat, 8 Feb 2025 16:45:23 +0000 (16:45 +0000)]
Merge remote-tracking branch 'upstream/pull/5630'

13 days agoRemove unnecessary RuboCop exclusions
Anton Khorev [Sun, 2 Feb 2025 11:39:14 +0000 (14:39 +0300)]
Remove unnecessary RuboCop exclusions

13 days agoClean up after creating nested relation resources
Anton Khorev [Sun, 2 Feb 2025 11:32:57 +0000 (14:32 +0300)]
Clean up after creating nested relation resources

13 days agoDeclare api relation relations as nested resources
Anton Khorev [Sun, 2 Feb 2025 11:27:20 +0000 (14:27 +0300)]
Declare api relation relations as nested resources

13 days agoDeclare api way relations as nested resources
Anton Khorev [Sun, 2 Feb 2025 11:06:12 +0000 (14:06 +0300)]
Declare api way relations as nested resources

13 days agoDeclare api node relations as nested resources
Anton Khorev [Sun, 2 Feb 2025 10:38:46 +0000 (13:38 +0300)]
Declare api node relations as nested resources

13 days agoDeclare api node ways as nested resources
Anton Khorev [Sun, 2 Feb 2025 10:11:03 +0000 (13:11 +0300)]
Declare api node ways as nested resources

2 weeks agoBump eslint from 9.19.0 to 9.20.0
dependabot[bot] [Fri, 7 Feb 2025 23:11:11 +0000 (23:11 +0000)]
Bump eslint from 9.19.0 to 9.20.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.19.0 to 9.20.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.19.0...v9.20.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 agoRefactor direction engines and unify structure
Marwin Hochfelsner [Tue, 4 Feb 2025 13:42:06 +0000 (14:42 +0100)]
Refactor direction engines and unify structure

2 weeks agoMerge remote-tracking branch 'upstream/pull/5598'
Tom Hughes [Thu, 6 Feb 2025 20:27:32 +0000 (20:27 +0000)]
Merge remote-tracking branch 'upstream/pull/5598'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5628'
Tom Hughes [Thu, 6 Feb 2025 20:19:23 +0000 (20:19 +0000)]
Merge remote-tracking branch 'upstream/pull/5628'

2 weeks agoTest showing note by suspended user with comment by other user
Anton Khorev [Thu, 6 Feb 2025 19:45:31 +0000 (22:45 +0300)]
Test showing note by suspended user with comment by other user

2 weeks agoMerge branch 'pull/5627'
Anton Khorev [Thu, 6 Feb 2025 19:10:31 +0000 (22:10 +0300)]
Merge branch 'pull/5627'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5613'
Tom Hughes [Thu, 6 Feb 2025 17:41:46 +0000 (17:41 +0000)]
Merge remote-tracking branch 'upstream/pull/5613'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5614'
Tom Hughes [Thu, 6 Feb 2025 17:19:32 +0000 (17:19 +0000)]
Merge remote-tracking branch 'upstream/pull/5614'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5625'
Tom Hughes [Thu, 6 Feb 2025 17:15:55 +0000 (17:15 +0000)]
Merge remote-tracking branch 'upstream/pull/5625'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5623'
Tom Hughes [Thu, 6 Feb 2025 17:13:03 +0000 (17:13 +0000)]
Merge remote-tracking branch 'upstream/pull/5623'

2 weeks agoCorrect test for notes opened by inactive users
Tom Hughes [Thu, 6 Feb 2025 17:08:44 +0000 (17:08 +0000)]
Correct test for notes opened by inactive users

2 weeks agoAdd a test for viewing a note opened by a deleted user
Tom Hughes [Thu, 6 Feb 2025 17:08:22 +0000 (17:08 +0000)]
Add a test for viewing a note opened by a deleted user

2 weeks agoMerge branch 'pull/5609'
Anton Khorev [Thu, 6 Feb 2025 15:15:58 +0000 (18:15 +0300)]
Merge branch 'pull/5609'

2 weeks agoRemove spaces before colons in en.yml
Anton Khorev [Thu, 6 Feb 2025 13:37:07 +0000 (16:37 +0300)]
Remove spaces before colons in en.yml

2 weeks agoUpdate to iD v2.31.1
Martin Raifer [Thu, 6 Feb 2025 12:52:00 +0000 (13:52 +0100)]
Update to iD v2.31.1

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

2 weeks agoRemoves dropping note's first comment
Nenad Vujicic [Tue, 4 Feb 2025 16:30:10 +0000 (17:30 +0100)]
Removes dropping note's first comment

Removes dropping note's first visible comment in case of deleted note's author. After adding displaying "deleted" as note's description, first visible comment is now displayed as note's comment. Moves logic of calculating which note comments will be displayed and if note contains anonymous author / comments to the controller.

2 weeks agoSwitches from comments to all_comments
Nenad Vujicic [Tue, 4 Feb 2025 15:36:58 +0000 (16:36 +0100)]
Switches from comments to all_comments

Switches from using note's .comments to .all_comments. Fixes bug with notes of deleted users without comments, which are filtered out, but the code tries to access the first comment.

2 weeks agoChange eslint no-implicit-globals rule to error
Holger Jeromin [Wed, 5 Feb 2025 16:51:32 +0000 (17:51 +0100)]
Change eslint no-implicit-globals rule to error

2 weeks agoFix all no-implicit-globals eslint errors
Holger Jeromin [Wed, 5 Feb 2025 16:50:40 +0000 (17:50 +0100)]
Fix all no-implicit-globals eslint errors

2 weeks agochange eslint rule no-alert to error
Holger Jeromin [Wed, 5 Feb 2025 17:06:40 +0000 (18:06 +0100)]
change eslint rule no-alert to error

2 weeks agoMark valid usecases for alert
Holger Jeromin [Wed, 5 Feb 2025 17:04:57 +0000 (18:04 +0100)]
Mark valid usecases for alert

2 weeks agoMerge remote-tracking branch 'upstream/pull/5603'
Tom Hughes [Wed, 5 Feb 2025 19:14:02 +0000 (19:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5603'

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

2 weeks agoMerge remote-tracking branch 'upstream/pull/5620'
Tom Hughes [Wed, 5 Feb 2025 19:00:14 +0000 (19:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5620'

2 weeks agoSimplify initialisation of iD
Marwin Hochfelsner [Mon, 3 Feb 2025 07:42:40 +0000 (08:42 +0100)]
Simplify initialisation of iD