]> git.openstreetmap.org Git - rails.git/log
rails.git
2 months agoRemove current_user branch from ApiController#deny_access
Anton Khorev [Fri, 14 Feb 2025 22:20:06 +0000 (01:20 +0300)]
Remove current_user branch from ApiController#deny_access

Unreachable because if there's no doorkeeper_token, there's also no current_user.

2 months agoMerge remote-tracking branch 'upstream/pull/5666'
Tom Hughes [Thu, 13 Feb 2025 22:03:28 +0000 (22:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5666'

2 months agoTest commenting changesets with different scopes
Anton Khorev [Thu, 13 Feb 2025 01:31:23 +0000 (04:31 +0300)]
Test commenting changesets with different scopes

2 months agoAdd write_changeset_comments scope
Anton Khorev [Wed, 12 Feb 2025 16:32:14 +0000 (19:32 +0300)]
Add write_changeset_comments scope

2 months agoPass scopes instead of token to ApiAbility
Anton Khorev [Wed, 12 Feb 2025 15:13:56 +0000 (18:13 +0300)]
Pass scopes instead of token to ApiAbility

2 months agoPass user to ApiAbility
Anton Khorev [Wed, 12 Feb 2025 14:14:21 +0000 (17:14 +0300)]
Pass user to ApiAbility

2 months agoSplit api changeset comment unhide fail tests
Anton Khorev [Thu, 13 Feb 2025 00:03:36 +0000 (03:03 +0300)]
Split api changeset comment unhide fail tests

2 months agoSplit api changeset comment hide fail tests
Anton Khorev [Wed, 12 Feb 2025 23:49:54 +0000 (02:49 +0300)]
Split api changeset comment hide fail tests

2 months agoSplit changeset comment subscription emails test
Anton Khorev [Thu, 13 Feb 2025 01:05:56 +0000 (04:05 +0300)]
Split changeset comment subscription emails test

2 months agoTest state of created comment
Anton Khorev [Thu, 13 Feb 2025 00:33:48 +0000 (03:33 +0300)]
Test state of created comment

2 months agoSplit api changeset comment create scope and terms tests
Anton Khorev [Wed, 12 Feb 2025 16:03:42 +0000 (19:03 +0300)]
Split api changeset comment create scope and terms tests

2 months agoSplit api changeset comment create fail tests
Anton Khorev [Wed, 12 Feb 2025 15:56:09 +0000 (18:56 +0300)]
Split api changeset comment create fail tests

2 months agoRename api changeset comment tests
Anton Khorev [Wed, 12 Feb 2025 15:42:27 +0000 (18:42 +0300)]
Rename api changeset comment tests

2 months agoMerge remote-tracking branch 'upstream/pull/5668'
Tom Hughes [Thu, 13 Feb 2025 18:08:02 +0000 (18:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5668'

2 months agoMerge remote-tracking branch 'upstream/pull/5665'
Tom Hughes [Thu, 13 Feb 2025 17:49:59 +0000 (17:49 +0000)]
Merge remote-tracking branch 'upstream/pull/5665'

2 months agorerun script/misc/update-wiki-pages
Mateusz Konieczny [Thu, 13 Feb 2025 13:52:48 +0000 (14:52 +0100)]
rerun script/misc/update-wiki-pages

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

2 months agoBump rack from 2.2.10 to 2.2.11
dependabot[bot] [Wed, 12 Feb 2025 23:46:31 +0000 (23:46 +0000)]
Bump rack from 2.2.10 to 2.2.11

Bumps [rack](https://github.com/rack/rack) from 2.2.10 to 2.2.11.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.10...v2.2.11)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 months agoMerge remote-tracking branch 'upstream/pull/5632'
Tom Hughes [Wed, 12 Feb 2025 18:21:02 +0000 (18:21 +0000)]
Merge remote-tracking branch 'upstream/pull/5632'

2 months agoMerge remote-tracking branch 'upstream/pull/5661'
Tom Hughes [Wed, 12 Feb 2025 18:11:38 +0000 (18:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5661'

2 months agoMerge remote-tracking branch 'upstream/pull/5622'
Tom Hughes [Wed, 12 Feb 2025 17:59:25 +0000 (17:59 +0000)]
Merge remote-tracking branch 'upstream/pull/5622'

2 months agoMerge remote-tracking branch 'upstream/pull/5642'
Tom Hughes [Wed, 12 Feb 2025 17:58:06 +0000 (17:58 +0000)]
Merge remote-tracking branch 'upstream/pull/5642'

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

2 months agoUpdates notes filtering to search description too
Nenad Vujicic [Fri, 17 Jan 2025 17:53:05 +0000 (18:53 +0100)]
Updates notes filtering to search description too

Updates notes filtering to search for query text in both note comments and note's description.

2 months agoAdds index to notes on description column
Nenad Vujicic [Thu, 6 Feb 2025 21:01:21 +0000 (22:01 +0100)]
Adds index to notes on description column

Adds text index to description column to table notes.

2 months agoreplace all occurrences of `+`
Martin Raifer [Wed, 12 Feb 2025 15:23:31 +0000 (16:23 +0100)]
replace all occurrences of `+`

2 months agolint
Martin Raifer [Wed, 12 Feb 2025 13:10:25 +0000 (14:10 +0100)]
lint

2 months agoworkaround for iD bug #10761
Martin Raifer [Wed, 12 Feb 2025 13:08:19 +0000 (14:08 +0100)]
workaround for iD bug #10761

the current version of iD (v2.31, before the fix for https://github.com/openstreetmap/iD/issue/10761: https://github.com/openstreetmap/iD/pull/10766), does not fully support `x-www-form-urlencoded` "query-style" strings in the hash: Specifically, spaces encoded as `+` will not be decoded back to ` `.

This workaround essentially temporarily reverts the behaviour of the website to the state before #5592, and can be dropped again with the next minor version upgrade of iD (`v2.32`).

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

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

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

2 months agoGet directions using fetch
Marwin Hochfelsner [Sun, 9 Feb 2025 18:08:53 +0000 (19:08 +0100)]
Get directions using fetch

Co-authored-by: Holger Jeromin <h.jeromin@beckhoff.com>
2 months agoSet map param with array
Marwin Hochfelsner [Mon, 3 Feb 2025 08:07:31 +0000 (09:07 +0100)]
Set map param with array

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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