]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sat, 16 Mar 2024 16:02:53 +0000 (16:02 +0000)]
Merge remote-tracking branch 'upstream/pull/4584'
Anton Khorev [Sat, 16 Mar 2024 15:36:33 +0000 (18:36 +0300)]
Simplify changeset/element-related link_to calls
Tom Hughes [Sat, 16 Mar 2024 11:34:17 +0000 (11:34 +0000)]
Merge remote-tracking branch 'upstream/pull/4583'
Tom Hughes [Sat, 16 Mar 2024 11:32:34 +0000 (11:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4582'
Tom Hughes [Sat, 16 Mar 2024 11:28:58 +0000 (11:28 +0000)]
Merge remote-tracking branch 'upstream/pull/4581'
Anton Khorev [Sat, 16 Mar 2024 03:11:07 +0000 (06:11 +0300)]
Move changeset subscribe/unsubscribe to resourceful routes
Anton Khorev [Sat, 16 Mar 2024 01:51:42 +0000 (04:51 +0300)]
Don't pass paths to element_single_current_link helper
Anton Khorev [Sat, 16 Mar 2024 00:04:54 +0000 (03:04 +0300)]
Test links to containing relations from element pages
Tom Hughes [Fri, 15 Mar 2024 18:09:35 +0000 (18:09 +0000)]
Extend containing relation fix to nested relations
Tom Hughes [Fri, 15 Mar 2024 18:01:42 +0000 (18:01 +0000)]
Fix display of containing relations
Tom Hughes [Fri, 15 Mar 2024 17:02:45 +0000 (17:02 +0000)]
Merge remote-tracking branch 'upstream/pull/4579'
Tom Hughes [Fri, 15 Mar 2024 16:58:27 +0000 (16:58 +0000)]
Merge remote-tracking branch 'upstream/pull/4578'
Tom Hughes [Fri, 15 Mar 2024 16:55:02 +0000 (16:55 +0000)]
Merge remote-tracking branch 'upstream/pull/4580'
Milan Cvetkovic [Fri, 15 Mar 2024 11:06:24 +0000 (11:06 +0000)]
Use official "Log in to Microsoft" icon
Downloaded from https://learn.microsoft.com/en-us/entra/identity-platform/howto-add-branding-in-apps
on 2024-03-15.
Anton Khorev [Fri, 15 Mar 2024 00:24:45 +0000 (03:24 +0300)]
Move current element actions to their own controllers
Tom Hughes [Thu, 14 Mar 2024 20:01:11 +0000 (20:01 +0000)]
Merge remote-tracking branch 'upstream/pull/4576'
Tom Hughes [Thu, 14 Mar 2024 19:55:26 +0000 (19:55 +0000)]
Merge remote-tracking branch 'upstream/pull/4575'
Tom Hughes [Thu, 14 Mar 2024 19:51:28 +0000 (19:51 +0000)]
Merge remote-tracking branch 'upstream/pull/4577'
Milan Cvetkovic [Thu, 14 Mar 2024 15:51:41 +0000 (15:51 +0000)]
Fix "blocked" user signup page
- Remove `<h1>` and `<h2>` tags for main text.
- Emphasize1st paragraph with `<strong>`
Milan Cvetkovic [Tue, 5 Mar 2024 15:07:28 +0000 (15:07 +0000)]
Replace "Login" labels with "Log in" when used as a verb
Anton Khorev [Thu, 14 Mar 2024 15:10:18 +0000 (18:10 +0300)]
Move element history actions to old element controllers
Anton Khorev [Wed, 13 Mar 2024 23:44:25 +0000 (02:44 +0300)]
Collect node/way/relation CanCanCan subjects into arrays
Tom Hughes [Wed, 13 Mar 2024 18:05:48 +0000 (18:05 +0000)]
Merge remote-tracking branch 'upstream/pull/4566'
Andy Allan [Wed, 13 Mar 2024 16:45:17 +0000 (16:45 +0000)]
Merge pull request #4573 from AntonKhorev/api-routes-module
Use :module to specify api controllers module
Anton Khorev [Mon, 4 Mar 2024 10:47:19 +0000 (13:47 +0300)]
Use :module to specify api controllers module
Andy Allan [Wed, 13 Mar 2024 15:51:41 +0000 (15:51 +0000)]
Merge pull request #4557 from AntonKhorev/rename-api-old-version
Rename api old element actions and path helpers
Andy Allan [Wed, 13 Mar 2024 14:27:53 +0000 (14:27 +0000)]
Merge pull request #4572 from lonvia/update-hosting-partners
Update hosting partners as per OWG policy
Sarah Hoffmann [Wed, 13 Mar 2024 09:50:44 +0000 (10:50 +0100)]
update hosting partners as per OWG policy
Tom Hughes [Tue, 12 Mar 2024 18:48:09 +0000 (18:48 +0000)]
Merge remote-tracking branch 'upstream/pull/4570'
Tom Hughes [Tue, 12 Mar 2024 18:08:38 +0000 (18:08 +0000)]
Update bundle
Anton Khorev [Mon, 11 Mar 2024 19:39:13 +0000 (22:39 +0300)]
Fix whitespace in changeset element lists
Tom Hughes [Tue, 12 Mar 2024 00:13:20 +0000 (00:13 +0000)]
Consistently exclude hidden diaries from spam scoring
translatewiki.net [Mon, 11 Mar 2024 12:16:40 +0000 (13:16 +0100)]
Localisation updates from https://translatewiki.net.
Ishmeet Singh [Thu, 7 Mar 2024 18:39:06 +0000 (00:09 +0530)]
Test validation of title and description presence for redactions
Ishmeet Singh [Thu, 7 Mar 2024 18:38:26 +0000 (00:08 +0530)]
Add NOT NULL constraints to redaction title and description
Tom Hughes [Thu, 7 Mar 2024 18:13:50 +0000 (18:13 +0000)]
Merge remote-tracking branch 'upstream/pull/4564'
Andy Allan [Thu, 7 Mar 2024 13:51:44 +0000 (13:51 +0000)]
Merge pull request #4550 from tomhughes/drop-user-tokens
Drop user tokens table
translatewiki.net [Thu, 7 Mar 2024 12:16:29 +0000 (13:16 +0100)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Wed, 6 Mar 2024 23:04:30 +0000 (23:04 +0000)]
Bump qs from 6.11.2 to 6.12.0
Bumps [qs](https://github.com/ljharb/qs) from 6.11.2 to 6.12.0.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.11.2...v6.12.0)
---
updated-dependencies:
- dependency-name: qs
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Tue, 5 Mar 2024 19:32:48 +0000 (19:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4558'
Tom Hughes [Tue, 5 Mar 2024 18:56:04 +0000 (18:56 +0000)]
Update bundle
Anton Khorev [Tue, 5 Mar 2024 09:25:11 +0000 (12:25 +0300)]
Prevent default event when clicking OpenID button
Anton Khorev [Sun, 3 Mar 2024 10:13:26 +0000 (13:13 +0300)]
Rename api element version path helper
Anton Khorev [Sun, 3 Mar 2024 09:12:25 +0000 (12:12 +0300)]
Rename api element version action to show
Tom Hughes [Sun, 3 Mar 2024 18:47:20 +0000 (18:47 +0000)]
Merge remote-tracking branch 'upstream/pull/4554'
Anton Khorev [Sat, 2 Mar 2024 10:48:49 +0000 (13:48 +0300)]
Remove assert_response when followed by assert_redirected_to
Tom Hughes [Sat, 2 Mar 2024 16:55:04 +0000 (16:55 +0000)]
Merge remote-tracking branch 'upstream/pull/4555'
Andy Allan [Sat, 2 Mar 2024 15:48:54 +0000 (15:48 +0000)]
Be paranoid when sending password reset emails
This implements what is known as "paranoid" password reset flash
messages (using the terminology from Devise). It avoids revealing
whether the supplied email address is already registered.
Added an explicit test for this situation, so that the test for
email non-existance is separate from the duplicate-case tests.
Tom Hughes [Fri, 1 Mar 2024 19:23:51 +0000 (19:23 +0000)]
Merge remote-tracking branch 'upstream/pull/4324'
Tom Hughes [Fri, 1 Mar 2024 19:12:50 +0000 (19:12 +0000)]
Merge remote-tracking branch 'upstream/pull/4552'
Anton Khorev [Fri, 1 Mar 2024 12:58:48 +0000 (15:58 +0300)]
Refactor common element version view code
Anton Khorev [Fri, 1 Mar 2024 11:23:04 +0000 (14:23 +0300)]
Add links to reveal/hide redacted version data
Anton Khorev [Fri, 1 Mar 2024 09:29:06 +0000 (12:29 +0300)]
Don't show unredacted element versions to non-moderators
Anton Khorev [Sat, 4 Nov 2023 18:58:04 +0000 (21:58 +0300)]
Show unredacted element history
Anton Khorev [Sat, 4 Nov 2023 18:14:29 +0000 (21:14 +0300)]
Add link to unredacted element history for moderators
Anton Khorev [Thu, 29 Feb 2024 09:51:34 +0000 (12:51 +0300)]
Move changeset created/closed time ago strings to changesets locale
Anton Khorev [Thu, 29 Feb 2024 09:16:11 +0000 (12:16 +0300)]
Move changeset created/closed popup/feed strings to changesets locale
Anton Khorev [Thu, 29 Feb 2024 08:23:01 +0000 (11:23 +0300)]
Move all browse.changeset strings to changesets locale
Anton Khorev [Thu, 29 Feb 2024 08:02:30 +0000 (11:02 +0300)]
Move changeset element headings to changesets locale
Anton Khorev [Sat, 10 Feb 2024 17:33:33 +0000 (20:33 +0300)]
Move changeset show action to changesets controller
Tom Hughes [Thu, 29 Feb 2024 16:52:59 +0000 (16:52 +0000)]
Merge remote-tracking branch 'upstream/pull/4551'
translatewiki.net [Thu, 29 Feb 2024 12:16:52 +0000 (13:16 +0100)]
Localisation updates from https://translatewiki.net.
Martin Raifer [Thu, 29 Feb 2024 10:04:27 +0000 (11:04 +0100)]
Update to iD v2.28.1
Tom Hughes [Wed, 28 Feb 2024 20:59:34 +0000 (20:59 +0000)]
Drop user tokens table
Tom Hughes [Wed, 28 Feb 2024 15:29:38 +0000 (15:29 +0000)]
Merge remote-tracking branch 'upstream/pull/4548'
Martin Raifer [Wed, 28 Feb 2024 13:03:47 +0000 (14:03 +0100)]
Update to iD v2.28.0
Tom Hughes [Tue, 27 Feb 2024 20:53:51 +0000 (20:53 +0000)]
Generate email change token before changing the address
Tom Hughes [Tue, 27 Feb 2024 20:53:24 +0000 (20:53 +0000)]
Add a system test to do an end-end test of changing email
Tom Hughes [Tue, 27 Feb 2024 20:52:18 +0000 (20:52 +0000)]
Make the user factory generate valid passwords
Tom Hughes [Tue, 27 Feb 2024 18:07:04 +0000 (18:07 +0000)]
Merge remote-tracking branch 'upstream/pull/4545'
Tom Hughes [Tue, 27 Feb 2024 18:06:23 +0000 (18:06 +0000)]
Update bundle
dependabot[bot] [Mon, 26 Feb 2024 23:20:54 +0000 (23:20 +0000)]
Bump osm-community-index from 5.6.1 to 5.6.2
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.6.1 to 5.6.2.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.6.1...v5.6.2)
---
updated-dependencies:
- dependency-name: osm-community-index
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Mon, 26 Feb 2024 12:17:37 +0000 (13:17 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 25 Feb 2024 14:17:05 +0000 (14:17 +0000)]
Fix rubocop warnings
Tom Hughes [Sun, 25 Feb 2024 14:06:56 +0000 (14:06 +0000)]
Merge remote-tracking branch 'upstream/pull/4251'
Tom Hughes [Sun, 25 Feb 2024 13:40:11 +0000 (13:40 +0000)]
Merge remote-tracking branch 'upstream/pull/4272'
Tom Hughes [Sun, 25 Feb 2024 13:16:40 +0000 (13:16 +0000)]
Require display names to have a minimum unicode width of 3 columns
Fixes #4538
Andy Allan [Sun, 25 Feb 2024 10:36:05 +0000 (11:36 +0100)]
Merge pull request #4534 from tomhughes/list-headers
Add standard List-XXX headers to some notification mails
Andy Allan [Sun, 25 Feb 2024 10:35:20 +0000 (11:35 +0100)]
Merge pull request #4536 from tomhughes/trace-size-limit
Add a limit on the number of points in a GPS trace
Andy Allan [Sun, 25 Feb 2024 10:32:15 +0000 (11:32 +0100)]
Merge pull request #4535 from tomhughes/rails-tokens
Use rails generated tokens for emails
Andy Allan [Sun, 25 Feb 2024 10:31:21 +0000 (11:31 +0100)]
Merge pull request #4539 from tomhughes/confirmed-emails
Treat github and wikipedia provided emails as confirmed
Tom Hughes [Sun, 25 Feb 2024 10:04:18 +0000 (10:04 +0000)]
Treat github and wikipedia provided emails as confirmed
Fixes #4270
Tom Hughes [Sat, 24 Feb 2024 14:34:09 +0000 (14:34 +0000)]
Add a limit on the number of points in a GPS trace
Tom Hughes [Sat, 24 Feb 2024 09:57:21 +0000 (09:57 +0000)]
Add standard List-XXX headers to some notification messages
Tom Hughes [Sat, 24 Feb 2024 11:08:53 +0000 (11:08 +0000)]
Add unsubscribe link to changeset notification mails
Tom Hughes [Sat, 24 Feb 2024 10:11:57 +0000 (10:11 +0000)]
Move mechanics of changeset subscriptions into the model
Tom Hughes [Sat, 24 Feb 2024 11:09:24 +0000 (11:09 +0000)]
Rename path for changeset API subscription methods
Tom Hughes [Sun, 25 Feb 2024 09:28:48 +0000 (09:28 +0000)]
Merge remote-tracking branch 'upstream/pull/4463'
Andy Allan [Sun, 25 Feb 2024 08:50:10 +0000 (09:50 +0100)]
Merge pull request #4537 from tomhughes/multiple-trace-priority
Use a reduced priority for batch trace uploads
Tom Hughes [Sat, 24 Feb 2024 17:04:37 +0000 (17:04 +0000)]
Reduce priority of multiple simulataneous trace imports
Tom Hughes [Sat, 24 Feb 2024 16:57:26 +0000 (16:57 +0000)]
Move scheduling of trace import and destruction to the model
Tom Hughes [Thu, 7 Dec 2023 18:49:49 +0000 (18:49 +0000)]
Use rails tokens for signup confirmations
Tom Hughes [Sat, 24 Feb 2024 13:42:26 +0000 (13:42 +0000)]
Use rails tokens for email changes
Tom Hughes [Thu, 7 Dec 2023 18:30:12 +0000 (18:30 +0000)]
Use rails tokens for password resets
Tom Hughes [Wed, 6 Dec 2023 20:28:40 +0000 (20:28 +0000)]
Add scope for unexpired user tokens
Tom Hughes [Sat, 24 Feb 2024 08:44:32 +0000 (08:44 +0000)]
Remove bogus span element from eu translation
Tom Hughes [Sat, 24 Feb 2024 08:38:03 +0000 (08:38 +0000)]
Merge remote-tracking branch 'upstream/pull/4533'
dependabot[bot] [Fri, 23 Feb 2024 23:25:21 +0000 (23:25 +0000)]
Bump eslint from 8.56.0 to 8.57.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.56.0 to 8.57.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/v8.56.0...v8.57.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 22 Feb 2024 12:18:07 +0000 (13:18 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 22 Feb 2024 07:13:07 +0000 (07:13 +0000)]
Update to rails 7.1.3.2