]> git.openstreetmap.org Git - rails.git/log
rails.git
11 months agoMerge pull request #4496 from tomhughes/disabled-auth-error
Andy Allan [Wed, 15 May 2024 15:33:33 +0000 (16:33 +0100)]
Merge pull request #4496 from tomhughes/disabled-auth-error

Return an error when a disabled authentication mechanism is used

11 months agoMerge remote-tracking branch 'upstream/pull/4798'
Tom Hughes [Tue, 14 May 2024 23:33:26 +0000 (00:33 +0100)]
Merge remote-tracking branch 'upstream/pull/4798'

11 months agoMerge remote-tracking branch 'upstream/pull/4797'
Tom Hughes [Tue, 14 May 2024 23:33:20 +0000 (00:33 +0100)]
Merge remote-tracking branch 'upstream/pull/4797'

11 months agoMerge remote-tracking branch 'upstream/pull/4796'
Tom Hughes [Tue, 14 May 2024 23:33:07 +0000 (00:33 +0100)]
Merge remote-tracking branch 'upstream/pull/4796'

11 months agoMerge remote-tracking branch 'upstream/pull/4794'
Tom Hughes [Tue, 14 May 2024 23:32:52 +0000 (00:32 +0100)]
Merge remote-tracking branch 'upstream/pull/4794'

11 months agoConvert note markers to SVG
Hidde Wieringa [Tue, 14 May 2024 18:06:14 +0000 (20:06 +0200)]
Convert note markers to SVG

11 months agoConvert menu icon to SVG
Hidde Wieringa [Tue, 14 May 2024 18:23:31 +0000 (20:23 +0200)]
Convert menu icon to SVG

11 months agoImprove alignment of text and images on welcome page
Hidde Wieringa [Tue, 14 May 2024 18:21:41 +0000 (20:21 +0200)]
Improve alignment of text and images on welcome page

11 months agoConvert welcome sprite to SVG
Hidde Wieringa [Tue, 14 May 2024 18:00:03 +0000 (20:00 +0200)]
Convert welcome sprite to SVG

11 months agoConvert routing sprite to SVG
Hidde Wieringa [Tue, 14 May 2024 17:52:04 +0000 (19:52 +0200)]
Convert routing sprite to SVG

11 months agoLock multi_xml to 0.6 for ruby 3.0 compatibility
Tom Hughes [Tue, 14 May 2024 18:24:23 +0000 (19:24 +0100)]
Lock multi_xml to 0.6 for ruby 3.0 compatibility

11 months agoMerge remote-tracking branch 'upstream/pull/4791'
Tom Hughes [Tue, 14 May 2024 17:47:43 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4791'

11 months agoUpdate bundle
Tom Hughes [Tue, 14 May 2024 17:43:58 +0000 (18:43 +0100)]
Update bundle

11 months agoAdd warnings when creating notes anonymously
Anton Khorev [Tue, 14 May 2024 16:42:59 +0000 (19:42 +0300)]
Add warnings when creating notes anonymously

11 months agoMerge pull request #4790 from AntonKhorev/docs-https
Andy Allan [Tue, 14 May 2024 16:28:16 +0000 (17:28 +0100)]
Merge pull request #4790 from AntonKhorev/docs-https

Use https links in documentation

11 months agoUpdate bundler link
Anton Khorev [Tue, 14 May 2024 15:36:27 +0000 (18:36 +0300)]
Update bundler link

11 months agoUse https links in documentation
Anton Khorev [Tue, 14 May 2024 15:02:12 +0000 (18:02 +0300)]
Use https links in documentation

11 months agoMerge remote-tracking branch 'upstream/pull/4786'
Tom Hughes [Mon, 13 May 2024 17:56:31 +0000 (18:56 +0100)]
Merge remote-tracking branch 'upstream/pull/4786'

11 months agoMerge remote-tracking branch 'upstream/pull/4785'
Tom Hughes [Mon, 13 May 2024 17:55:45 +0000 (18:55 +0100)]
Merge remote-tracking branch 'upstream/pull/4785'

11 months agoMerge remote-tracking branch 'upstream/pull/4784'
Tom Hughes [Mon, 13 May 2024 17:54:48 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/4784'

11 months agoMerge remote-tracking branch 'upstream/pull/4783'
Tom Hughes [Mon, 13 May 2024 17:54:08 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/4783'

11 months agoRemove unused loading spinner image
Anton Khorev [Mon, 13 May 2024 13:11:35 +0000 (16:11 +0300)]
Remove unused loading spinner image

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 13 May 2024 12:15:10 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

11 months agoRemove unused small openid icon
Anton Khorev [Sun, 12 May 2024 22:11:47 +0000 (01:11 +0300)]
Remove unused small openid icon

11 months agoRemove unused myOpenID icon
Anton Khorev [Sun, 12 May 2024 22:01:15 +0000 (01:01 +0300)]
Remove unused myOpenID icon

11 months agoRemove unused map zoom icons
Anton Khorev [Sun, 12 May 2024 21:51:17 +0000 (00:51 +0300)]
Remove unused map zoom icons

11 months agoMerge remote-tracking branch 'upstream/pull/4782'
Tom Hughes [Sun, 12 May 2024 16:43:08 +0000 (17:43 +0100)]
Merge remote-tracking branch 'upstream/pull/4782'

11 months agoMerge remote-tracking branch 'upstream/pull/4781'
Tom Hughes [Sun, 12 May 2024 16:42:24 +0000 (17:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4781'

11 months agoRemove unused map sprite image
Anton Khorev [Sun, 12 May 2024 16:27:19 +0000 (19:27 +0300)]
Remove unused map sprite image

11 months agoUse bg-body in "log in / sign up to access" messages
Anton Khorev [Sun, 12 May 2024 14:58:21 +0000 (17:58 +0300)]
Use bg-body in "log in / sign up to access" messages

11 months agoStop login/signup tab bar getting reversed with RTL languages
Tom Hughes [Sun, 12 May 2024 13:55:17 +0000 (14:55 +0100)]
Stop login/signup tab bar getting reversed with RTL languages

Fixes #4780

11 months agoReally remove login.live.com from CSP allow list
Tom Hughes [Fri, 10 May 2024 16:55:11 +0000 (17:55 +0100)]
Really remove login.live.com from CSP allow list

11 months agoMerge remote-tracking branch 'upstream/pull/4779'
Tom Hughes [Fri, 10 May 2024 16:49:05 +0000 (17:49 +0100)]
Merge remote-tracking branch 'upstream/pull/4779'

11 months agoMerge remote-tracking branch 'upstream/pull/4778'
Tom Hughes [Fri, 10 May 2024 16:48:09 +0000 (17:48 +0100)]
Merge remote-tracking branch 'upstream/pull/4778'

11 months agoFix CSP failures for Microsoft social sign-in
Milan Cvetkovic [Fri, 10 May 2024 14:11:12 +0000 (14:11 +0000)]
Fix CSP failures for Microsoft social sign-in

Replace login.live.com with login.microsoftonline.com in CSP allow list.

The URL changed with the move from using the omniauth-windowslive plugin
to the omniauth-microsoft_graph plugin but wasn't noticed until now.

11 months agoUse consistent sizing for social signup buttons
Milan Cvetkovic [Fri, 10 May 2024 16:08:06 +0000 (16:08 +0000)]
Use consistent sizing for social signup buttons

11 months agoMerge remote-tracking branch 'upstream/pull/4776'
Tom Hughes [Thu, 9 May 2024 18:13:50 +0000 (19:13 +0100)]
Merge remote-tracking branch 'upstream/pull/4776'

11 months agoMerge remote-tracking branch 'upstream/pull/4774'
Tom Hughes [Thu, 9 May 2024 18:12:04 +0000 (19:12 +0100)]
Merge remote-tracking branch 'upstream/pull/4774'

11 months agoRemove border attribute from <img> on Copyright page
Anton Khorev [Thu, 9 May 2024 12:14:00 +0000 (15:14 +0300)]
Remove border attribute from <img> on Copyright page

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 May 2024 12:15:25 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

11 months agoBump coverallsapp/github-action from 2.2.3 to 2.3.0
dependabot[bot] [Wed, 8 May 2024 23:04:38 +0000 (23:04 +0000)]
Bump coverallsapp/github-action from 2.2.3 to 2.3.0

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.2.3 to 2.3.0.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.2.3...v2.3.0)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
11 months agoMerge remote-tracking branch 'upstream/pull/4764'
Tom Hughes [Wed, 8 May 2024 17:47:09 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4764'

11 months agoMerge remote-tracking branch 'upstream/pull/4772'
Tom Hughes [Wed, 8 May 2024 17:29:53 +0000 (18:29 +0100)]
Merge remote-tracking branch 'upstream/pull/4772'

11 months agoMerge remote-tracking branch 'upstream/pull/4771'
Tom Hughes [Wed, 8 May 2024 17:24:28 +0000 (18:24 +0100)]
Merge remote-tracking branch 'upstream/pull/4771'

11 months agoMerge remote-tracking branch 'upstream/pull/4770'
Tom Hughes [Wed, 8 May 2024 17:22:31 +0000 (18:22 +0100)]
Merge remote-tracking branch 'upstream/pull/4770'

11 months agoMerge remote-tracking branch 'upstream/pull/4768'
Tom Hughes [Wed, 8 May 2024 17:19:07 +0000 (18:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4768'

11 months agoRemove bs-custom-file-input javascript plugin
Anton Khorev [Wed, 8 May 2024 14:47:52 +0000 (17:47 +0300)]
Remove bs-custom-file-input javascript plugin

11 months agoMake blank role icons transparent
Anton Khorev [Wed, 8 May 2024 14:05:57 +0000 (17:05 +0300)]
Make blank role icons transparent

11 months agoLighten moderator icon color
Anton Khorev [Wed, 8 May 2024 11:25:10 +0000 (14:25 +0300)]
Lighten moderator icon color

11 months agoLighten Leaflet scale control borders in dark mode
Anton Khorev [Wed, 8 May 2024 11:07:55 +0000 (14:07 +0300)]
Lighten Leaflet scale control borders in dark mode

11 months agoAdapt Leaflet scale and attribution controls to dark mode
Anton Khorev [Tue, 7 May 2024 13:55:37 +0000 (16:55 +0300)]
Adapt Leaflet scale and attribution controls to dark mode

11 months agoPin browser to versions that support ruby 3.0
Andy Allan [Wed, 8 May 2024 09:40:48 +0000 (10:40 +0100)]
Pin browser to versions that support ruby 3.0

11 months agoMerge remote-tracking branch 'upstream/pull/4762'
Tom Hughes [Tue, 7 May 2024 17:24:41 +0000 (18:24 +0100)]
Merge remote-tracking branch 'upstream/pull/4762'

11 months agoUpdate bundle
Tom Hughes [Tue, 7 May 2024 17:11:04 +0000 (18:11 +0100)]
Update bundle

11 months agoDelete role icon files
Anton Khorev [Tue, 7 May 2024 12:25:22 +0000 (15:25 +0300)]
Delete role icon files

11 months agoUse inline svgs for moderator scope icons
Anton Khorev [Tue, 7 May 2024 12:23:38 +0000 (15:23 +0300)]
Use inline svgs for moderator scope icons

11 months agoUse inline svgs for user role icons
Anton Khorev [Tue, 7 May 2024 10:30:48 +0000 (13:30 +0300)]
Use inline svgs for user role icons

11 months agoMerge remote-tracking branch 'upstream/pull/4759'
Tom Hughes [Mon, 6 May 2024 17:36:44 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4759'

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 May 2024 12:15:12 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

11 months agoUse inline svg for notice icons
Anton Khorev [Mon, 6 May 2024 11:33:57 +0000 (14:33 +0300)]
Use inline svg for notice icons

Allows to set fill to currentColor which adapts to dark mode.

11 months agoMerge remote-tracking branch 'upstream/pull/4696'
Tom Hughes [Mon, 6 May 2024 11:04:21 +0000 (12:04 +0100)]
Merge remote-tracking branch 'upstream/pull/4696'

11 months agoRemove the arm pointing to the new user registration form
Anton Khorev [Sat, 13 Apr 2024 15:25:06 +0000 (18:25 +0300)]
Remove the arm pointing to the new user registration form

The arm has a white shadow that doesn't look good in dark mode.

11 months agoMerge remote-tracking branch 'upstream/pull/4757'
Tom Hughes [Mon, 6 May 2024 10:15:12 +0000 (11:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4757'

11 months agoSimplify message paths in tests
Anton Khorev [Mon, 6 May 2024 09:37:57 +0000 (12:37 +0300)]
Simplify message paths in tests

11 months agoMerge remote-tracking branch 'upstream/pull/4455'
Tom Hughes [Mon, 6 May 2024 08:15:03 +0000 (09:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4455'

11 months agoImprove flash message handling in users#new
Tom Hughes [Mon, 6 May 2024 07:54:36 +0000 (08:54 +0100)]
Improve flash message handling in users#new

Only show the duplicate email message if we actually have errors
logged against the email field, and then show it as a warning.

In all other cases we show the generic informational hint about
social logins and pre-existing accounts.

11 months agoMerge remote-tracking branch 'upstream/pull/4753'
Tom Hughes [Sun, 5 May 2024 17:54:57 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/4753'

11 months agoMerge remote-tracking branch 'upstream/pull/4752'
Tom Hughes [Sun, 5 May 2024 17:51:37 +0000 (18:51 +0100)]
Merge remote-tracking branch 'upstream/pull/4752'

11 months agoMerge remote-tracking branch 'upstream/pull/4751'
Tom Hughes [Sun, 5 May 2024 17:48:08 +0000 (18:48 +0100)]
Merge remote-tracking branch 'upstream/pull/4751'

11 months agoRemove tests for message paths without ids
Anton Khorev [Sun, 5 May 2024 14:14:37 +0000 (17:14 +0300)]
Remove tests for message paths without ids

These tests don't fail because they reuse ids from previous requests.

11 months agoRedirect to inbox after marking a message as read/unread disregarding referer
Anton Khorev [Sun, 5 May 2024 12:32:47 +0000 (15:32 +0300)]
Redirect to inbox after marking a message as read/unread disregarding referer

Avoids staying on the message page after the "Mark as unread" button is clicked and immediately reading the message again.

11 months agoRename unread_message to message in messages controller test
Anton Khorev [Sun, 5 May 2024 12:21:09 +0000 (15:21 +0300)]
Rename unread_message to message in messages controller test

There's only one message in the affected test methods. That message becomes read during the test.

11 months agoBump eslint from 9.1.1 to 9.2.0
dependabot[bot] [Fri, 3 May 2024 23:24:28 +0000 (23:24 +0000)]
Bump eslint from 9.1.1 to 9.2.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.1.1 to 9.2.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.1.1...v9.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
11 months agoMerge remote-tracking branch 'upstream/pull/4747'
Tom Hughes [Thu, 2 May 2024 16:52:45 +0000 (17:52 +0100)]
Merge remote-tracking branch 'upstream/pull/4747'

11 months agoMerge remote-tracking branch 'upstream/pull/4746'
Tom Hughes [Thu, 2 May 2024 16:48:03 +0000 (17:48 +0100)]
Merge remote-tracking branch 'upstream/pull/4746'

11 months agoMerge remote-tracking branch 'upstream/pull/4745'
Tom Hughes [Thu, 2 May 2024 16:44:06 +0000 (17:44 +0100)]
Merge remote-tracking branch 'upstream/pull/4745'

11 months agoMerge remote-tracking branch 'upstream/pull/4748'
Tom Hughes [Thu, 2 May 2024 16:40:47 +0000 (17:40 +0100)]
Merge remote-tracking branch 'upstream/pull/4748'

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 May 2024 12:17:23 +0000 (14:17 +0200)]
Localisation updates from https://translatewiki.net.

11 months agoBump osm-community-index from 5.6.2 to 5.6.3
dependabot[bot] [Wed, 1 May 2024 23:48:22 +0000 (23:48 +0000)]
Bump osm-community-index from 5.6.2 to 5.6.3

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.6.2 to 5.6.3.
- [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.2...v5.6.3)

---
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>
11 months agoLink to previous/next nonempty user's changeset on changeset pages
Anton Khorev [Wed, 1 May 2024 12:02:59 +0000 (15:02 +0300)]
Link to previous/next nonempty user's changeset on changeset pages

11 months agoUse common sidebar_browse_check in notes controller test
Anton Khorev [Wed, 1 May 2024 10:21:24 +0000 (13:21 +0300)]
Use common sidebar_browse_check in notes controller test

11 months agoRestore constraints on note id parameter
Anton Khorev [Wed, 1 May 2024 10:17:14 +0000 (13:17 +0300)]
Restore constraints on note id parameter

11 months agoUpdate outdated tags of amenity/office/shop browse icons
Anton Khorev [Wed, 1 May 2024 07:25:38 +0000 (10:25 +0300)]
Update outdated tags of amenity/office/shop browse icons

11 months agoMerge remote-tracking branch 'upstream/pull/4735'
Tom Hughes [Tue, 30 Apr 2024 17:58:42 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/4735'

11 months agoMerge remote-tracking branch 'upstream/pull/4712'
Tom Hughes [Tue, 30 Apr 2024 17:46:14 +0000 (18:46 +0100)]
Merge remote-tracking branch 'upstream/pull/4712'

11 months agoMerge remote-tracking branch 'upstream/pull/4744'
Tom Hughes [Tue, 30 Apr 2024 17:41:01 +0000 (18:41 +0100)]
Merge remote-tracking branch 'upstream/pull/4744'

11 months agoMerge remote-tracking branch 'upstream/pull/4740'
Tom Hughes [Tue, 30 Apr 2024 17:37:25 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4740'

11 months agoMerge remote-tracking branch 'upstream/pull/4739'
Tom Hughes [Tue, 30 Apr 2024 17:34:43 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/4739'

11 months agoUpdate bundle
Tom Hughes [Tue, 30 Apr 2024 17:07:55 +0000 (18:07 +0100)]
Update bundle

11 months agoSet trace thumbnail link display property to inline-block, fixing focus outline
Anton Khorev [Tue, 30 Apr 2024 14:14:07 +0000 (17:14 +0300)]
Set trace thumbnail link display property to inline-block, fixing focus outline

This makes <a> as tall as <img> inside it.

11 months agoDon't change display property of messages table header cell
Anton Khorev [Tue, 30 Apr 2024 03:58:43 +0000 (06:58 +0300)]
Don't change display property of messages table header cell

11 months agoRemove .message-summary css classes and selectors
Anton Khorev [Tue, 30 Apr 2024 03:49:30 +0000 (06:49 +0300)]
Remove .message-summary css classes and selectors

They are not necessary because they select every table body row, and the table already has its own class.

11 months agoInvert dark browse icons in dark mode
Anton Khorev [Mon, 29 Apr 2024 04:16:01 +0000 (07:16 +0300)]
Invert dark browse icons in dark mode

11 months agoWrite browse icons using Sass loop
Anton Khorev [Mon, 29 Apr 2024 04:14:30 +0000 (07:14 +0300)]
Write browse icons using Sass loop

11 months agoMerge remote-tracking branch 'upstream/pull/4736'
Tom Hughes [Mon, 29 Apr 2024 21:40:53 +0000 (22:40 +0100)]
Merge remote-tracking branch 'upstream/pull/4736'

11 months agoMerge remote-tracking branch 'upstream/pull/4737'
Tom Hughes [Mon, 29 Apr 2024 21:38:55 +0000 (22:38 +0100)]
Merge remote-tracking branch 'upstream/pull/4737'

11 months agoMerge remote-tracking branch 'upstream/pull/4738'
Tom Hughes [Mon, 29 Apr 2024 21:37:30 +0000 (22:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4738'

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 29 Apr 2024 12:16:28 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

11 months agoRe-introduce additional round trip for verifying auth_provider
Milan Cvetkovic [Fri, 26 Apr 2024 06:08:04 +0000 (06:08 +0000)]
Re-introduce additional round trip for verifying auth_provider

11 months agoRename verified_email to email_hmac parameter in /users/new
Milan Cvetkovic [Mon, 22 Apr 2024 08:42:01 +0000 (08:42 +0000)]
Rename verified_email to email_hmac parameter in /users/new