]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Thu, 21 Mar 2024 12:58:29 +0000 (12:58 +0000)]
Merge remote-tracking branch 'upstream/pull/4606'
translatewiki.net [Thu, 21 Mar 2024 12:19:52 +0000 (13:19 +0100)]
Localisation updates from https://translatewiki.net.
Gregory Igelmund [Thu, 21 Mar 2024 11:09:32 +0000 (12:09 +0100)]
Replace csp_meta_tag with `secure_headers` nonce
Andy Allan [Thu, 21 Mar 2024 10:43:00 +0000 (10:43 +0000)]
Merge pull request #4604 from AntonKhorev/block-factory-revoked-expired
Make factory-created revoked blocks inactive
Anton Khorev [Thu, 21 Mar 2024 03:09:14 +0000 (06:09 +0300)]
Make factory-created revoked blocks inactive
Tom Hughes [Wed, 20 Mar 2024 17:22:00 +0000 (17:22 +0000)]
Merge remote-tracking branch 'upstream/pull/4600'
Andy Allan [Wed, 20 Mar 2024 17:20:57 +0000 (17:20 +0000)]
Merge pull request #4599 from AntonKhorev/rename-messages-local
Rename message local in message table partials
Andy Allan [Wed, 20 Mar 2024 17:11:37 +0000 (17:11 +0000)]
Merge pull request #4598 from AntonKhorev/fix-trace-description
Fix trace feed image urls and local variable names
Andy Allan [Wed, 20 Mar 2024 17:05:28 +0000 (17:05 +0000)]
Fix warning on unescaped hyphen in regexp
Anton Khorev [Wed, 20 Mar 2024 16:43:32 +0000 (19:43 +0300)]
Rename message local in message table partials
Anton Khorev [Wed, 20 Mar 2024 15:49:10 +0000 (18:49 +0300)]
Rename trace local in trace description partial
Andy Allan [Wed, 20 Mar 2024 15:45:10 +0000 (15:45 +0000)]
Merge pull request #4574 from urbalazs/wiki-prefixes-240313
Add more wiki prefixes
Anton Khorev [Wed, 20 Mar 2024 15:34:15 +0000 (18:34 +0300)]
Use absolute paths to trace icon in traces feed
Andy Allan [Wed, 20 Mar 2024 14:44:42 +0000 (14:44 +0000)]
Merge pull request #4592 from AntonKhorev/simplify-link_to-on-block-pages
Simplify link_to user calls on block pages
Andy Allan [Wed, 20 Mar 2024 14:42:20 +0000 (14:42 +0000)]
Merge pull request #4593 from AntonKhorev/simplify-link_to-on-issue-pages
Simplify link_to user calls on issue pages
Andy Allan [Wed, 20 Mar 2024 14:30:06 +0000 (14:30 +0000)]
Merge pull request #4594 from AntonKhorev/simplify-link_to-on-message-pages
Simplify link_to calls on message pages
Andy Allan [Wed, 20 Mar 2024 12:01:26 +0000 (12:01 +0000)]
Merge pull request #4595 from AntonKhorev/simplify-links-on-trace-pages
Simplify links on trace pages
Anton Khorev [Wed, 20 Mar 2024 03:07:24 +0000 (06:07 +0300)]
Simplify links on trace pages
Anton Khorev [Wed, 20 Mar 2024 01:48:02 +0000 (04:48 +0300)]
Simplify link_to calls on message pages
Anton Khorev [Wed, 20 Mar 2024 01:38:34 +0000 (04:38 +0300)]
Simplify link_to user calls on issue pages
Anton Khorev [Wed, 20 Mar 2024 01:27:58 +0000 (04:27 +0300)]
Simplify link_to user calls on block pages
Tom Hughes [Tue, 19 Mar 2024 18:24:33 +0000 (18:24 +0000)]
Merge remote-tracking branch 'upstream/pull/4591'
Tom Hughes [Tue, 19 Mar 2024 18:09:05 +0000 (18:09 +0000)]
Update bundle
Anton Khorev [Tue, 19 Mar 2024 03:58:43 +0000 (06:58 +0300)]
Shorten user path helper calls in tests
Tom Hughes [Mon, 18 Mar 2024 17:32:34 +0000 (17:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4586'
Tom Hughes [Mon, 18 Mar 2024 17:31:06 +0000 (17:31 +0000)]
Merge remote-tracking branch 'upstream/pull/4585'
translatewiki.net [Mon, 18 Mar 2024 12:17:47 +0000 (13:17 +0100)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Sun, 17 Mar 2024 22:31:12 +0000 (01:31 +0300)]
Count only tbody rows when testing tables
Anton Khorev [Sun, 17 Mar 2024 20:51:25 +0000 (23:51 +0300)]
Change "people mapping nearby" empty inbox/outbox link to dashboard
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
Balázs Úr [Wed, 13 Mar 2024 18:46:48 +0000 (19:46 +0100)]
Add more wiki prefixes
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'