]> git.openstreetmap.org Git - rails.git/log
rails.git
3 years agoMerge remote-tracking branch 'upstream/pull/3152'
Tom Hughes [Wed, 24 Mar 2021 21:14:41 +0000 (21:14 +0000)]
Merge remote-tracking branch 'upstream/pull/3152'

3 years agoPrevent addition of style attributes to all elements
Andy Allan [Wed, 24 Mar 2021 20:55:30 +0000 (20:55 +0000)]
Prevent addition of style attributes to all elements

3 years agoMerge remote-tracking branch 'upstream/pull/3149'
Tom Hughes [Wed, 24 Mar 2021 19:53:41 +0000 (19:53 +0000)]
Merge remote-tracking branch 'upstream/pull/3149'

3 years agoStrip away class attributes from sanitized outputs
Andy Allan [Wed, 24 Mar 2021 19:15:21 +0000 (19:15 +0000)]
Strip away class attributes from sanitized outputs

There's a lot of shenanigans that are possible when you can apply
arbitrary classes to the rendered output.

3 years agoRework configuration to use Sanitize::Config.merge
Andy Allan [Wed, 24 Mar 2021 18:19:14 +0000 (18:19 +0000)]
Rework configuration to use Sanitize::Config.merge

This is the recommended approach, and works better when dealing with deeper attributes

3 years agoAdd tests for richtext table classes
Andy Allan [Wed, 24 Mar 2021 17:55:15 +0000 (17:55 +0000)]
Add tests for richtext table classes

3 years agoMerge remote-tracking branch 'upstream/pull/3147'
Tom Hughes [Wed, 24 Mar 2021 15:32:16 +0000 (15:32 +0000)]
Merge remote-tracking branch 'upstream/pull/3147'

3 years agoMerge remote-tracking branch 'upstream/pull/3148'
Tom Hughes [Wed, 24 Mar 2021 15:32:13 +0000 (15:32 +0000)]
Merge remote-tracking branch 'upstream/pull/3148'

3 years agoBundle update for mimemagic yankage
Andy Allan [Wed, 24 Mar 2021 13:45:18 +0000 (13:45 +0000)]
Bundle update for mimemagic yankage

3 years agoMove sessions-related tests out of UsersControllerTest
Andy Allan [Wed, 24 Mar 2021 11:40:17 +0000 (11:40 +0000)]
Move sessions-related tests out of UsersControllerTest

3 years agoRefactor login/logout into sessions controller
Andy Allan [Wed, 10 Mar 2021 14:15:14 +0000 (14:15 +0000)]
Refactor login/logout into sessions controller

Certain controller methods are shared with oauth-based logins, and these have been
moved to a concern.

3 years agoFix new rubocop warnings
Tom Hughes [Tue, 23 Mar 2021 19:48:13 +0000 (19:48 +0000)]
Fix new rubocop warnings

3 years agoUpdate bundle
Tom Hughes [Tue, 23 Mar 2021 19:34:34 +0000 (19:34 +0000)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Mar 2021 14:44:07 +0000 (15:44 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3142'
Tom Hughes [Mon, 22 Mar 2021 07:23:00 +0000 (07:23 +0000)]
Merge remote-tracking branch 'upstream/pull/3142'

3 years agoMerge remote-tracking branch 'upstream/pull/3144'
Tom Hughes [Mon, 22 Mar 2021 07:05:57 +0000 (07:05 +0000)]
Merge remote-tracking branch 'upstream/pull/3144'

3 years agoBump qs from 6.10.0 to 6.10.1
dependabot[bot] [Mon, 22 Mar 2021 05:02:44 +0000 (05:02 +0000)]
Bump qs from 6.10.0 to 6.10.1

Bumps [qs](https://github.com/ljharb/qs) from 6.10.0 to 6.10.1.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.0...v6.10.1)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoAdded place=archipelago to en.yml
Morten Bruhn [Sun, 21 Mar 2021 18:33:30 +0000 (19:33 +0100)]
Added place=archipelago to en.yml

3 years agoAdded natural=atoll to en.yml
Morten Bruhn [Sun, 21 Mar 2021 18:31:17 +0000 (19:31 +0100)]
Added natural=atoll to en.yml

3 years agoMerge remote-tracking branch 'upstream/pull/3141'
Tom Hughes [Sun, 21 Mar 2021 15:07:59 +0000 (15:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3141'

3 years agoHandle errors checking for gravatars
Tom Hughes [Sun, 21 Mar 2021 10:21:25 +0000 (10:21 +0000)]
Handle errors checking for gravatars

3 years agoBump qs from 6.9.6 to 6.10.0
dependabot[bot] [Fri, 19 Mar 2021 05:02:29 +0000 (05:02 +0000)]
Bump qs from 6.9.6 to 6.10.0

Bumps [qs](https://github.com/ljharb/qs) from 6.9.6 to 6.10.0.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.9.6...v6.10.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 18 Mar 2021 12:49:53 +0000 (13:49 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3140'
Tom Hughes [Wed, 17 Mar 2021 19:11:35 +0000 (19:11 +0000)]
Merge remote-tracking branch 'upstream/pull/3140'

3 years agoUse list-inline to achieve spacing between elements on a line
Andy Allan [Wed, 17 Mar 2021 18:57:36 +0000 (18:57 +0000)]
Use list-inline to achieve spacing between elements on a line

This is a better solution than spans and margins. Additionally, rework
to use mb-* instead of my-* (bootstrap advises against using margin-top)
and get rid of <br>s by using paragraphs instead.

3 years agoMerge remote-tracking branch 'upstream/pull/3124'
Tom Hughes [Wed, 17 Mar 2021 18:17:49 +0000 (18:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3124'

3 years agoMerge remote-tracking branch 'upstream/pull/3138'
Tom Hughes [Wed, 17 Mar 2021 18:16:15 +0000 (18:16 +0000)]
Merge remote-tracking branch 'upstream/pull/3138'

3 years agoMerge remote-tracking branch 'upstream/pull/3139'
Tom Hughes [Wed, 17 Mar 2021 18:14:40 +0000 (18:14 +0000)]
Merge remote-tracking branch 'upstream/pull/3139'

3 years agoRefactor traces list display
Andy Allan [Wed, 17 Mar 2021 17:57:18 +0000 (17:57 +0000)]
Refactor traces list display

Ideas taken from #3036

3 years agoUse .add method for adding errors
Andy Allan [Wed, 17 Mar 2021 17:02:32 +0000 (17:02 +0000)]
Use .add method for adding errors

This avoids a deprecation warning on rails 6.1

3 years agoMerge branch 'pull/3112'
Andy Allan [Wed, 17 Mar 2021 16:07:43 +0000 (16:07 +0000)]
Merge branch 'pull/3112'

3 years agoRemove unused translations
Andy Allan [Wed, 17 Mar 2021 16:06:26 +0000 (16:06 +0000)]
Remove unused translations

3 years agoMerge remote-tracking branch 'upstream/pull/3137'
Tom Hughes [Wed, 17 Mar 2021 15:56:27 +0000 (15:56 +0000)]
Merge remote-tracking branch 'upstream/pull/3137'

3 years agoUpdate code example to follow rubocop recommendations
Andy Allan [Wed, 17 Mar 2021 15:37:55 +0000 (15:37 +0000)]
Update code example to follow rubocop recommendations

Just for consistency with what you would see elsewhere in the codebase

3 years agoUpdate bundle
Tom Hughes [Tue, 16 Mar 2021 11:56:43 +0000 (11:56 +0000)]
Update bundle

3 years agoMerge remote-tracking branch 'upstream/pull/3133'
Tom Hughes [Tue, 16 Mar 2021 11:07:47 +0000 (11:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3133'

3 years agoMerge remote-tracking branch 'upstream/pull/3132'
Tom Hughes [Tue, 16 Mar 2021 11:07:45 +0000 (11:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3132'

3 years agoReject referers that do not include an absolute path
Tom Hughes [Tue, 16 Mar 2021 11:06:18 +0000 (11:06 +0000)]
Reject referers that do not include an absolute path

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 Mar 2021 18:08:21 +0000 (19:08 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoBump eslint from 7.21.0 to 7.22.0
dependabot[bot] [Mon, 15 Mar 2021 05:02:22 +0000 (05:02 +0000)]
Bump eslint from 7.21.0 to 7.22.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.21.0 to 7.22.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.21.0...v7.22.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoBump leaflet.locatecontrol from 0.72.2 to 0.73.0
dependabot[bot] [Mon, 15 Mar 2021 05:02:04 +0000 (05:02 +0000)]
Bump leaflet.locatecontrol from 0.72.2 to 0.73.0

Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.72.2 to 0.73.0.
- [Release notes](https://github.com/domoritz/leaflet-locatecontrol/releases)
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.72.2...v0.73.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoAllow form submission to any location from the login page
Tom Hughes [Sun, 14 Mar 2021 10:18:32 +0000 (10:18 +0000)]
Allow form submission to any location from the login page

This allows openid login to work on browsers like chrome that enforce
the form-action rule for redirect POST requests.

Fixes #3131

3 years agoMerge remote-tracking branch 'upstream/pull/3130'
Tom Hughes [Sun, 14 Mar 2021 09:41:59 +0000 (09:41 +0000)]
Merge remote-tracking branch 'upstream/pull/3130'

3 years agoRemove GL and SH cantonal WMS servers from black list
Simon Poole [Sat, 13 Mar 2021 19:25:43 +0000 (20:25 +0100)]
Remove GL and SH cantonal WMS servers from black list

The previously restrictively licensed material is now available on relatively open terms directly from swisstopo per 1. March 2021, so these entries can be removed.

3 years agoChasing parse errors
Michal Migurski [Sat, 27 Feb 2021 05:01:57 +0000 (21:01 -0800)]
Chasing parse errors

3 years agoAdded missing translation
Michal Migurski [Sat, 27 Feb 2021 05:00:46 +0000 (21:00 -0800)]
Added missing translation

3 years agoSwitched to hash rockets syntax per erblint feedback
Michal Migurski [Sat, 27 Feb 2021 04:56:56 +0000 (20:56 -0800)]
Switched to hash rockets syntax per erblint feedback

3 years agoReplaced H2 messages header links with Bootstrap nav links
Michal Migurski [Sat, 27 Feb 2021 04:32:48 +0000 (20:32 -0800)]
Replaced H2 messages header links with Bootstrap nav links

Following suggestion from https://github.com/openstreetmap/openstreetmap-website/issues/2962#issuecomment-768985393

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 12 Mar 2021 06:06:49 +0000 (07:06 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3125'
Tom Hughes [Wed, 10 Mar 2021 14:55:58 +0000 (14:55 +0000)]
Merge remote-tracking branch 'upstream/pull/3125'

3 years agoUse login_path instead of explicit controller and actions
Andy Allan [Wed, 10 Mar 2021 14:14:36 +0000 (14:14 +0000)]
Use login_path instead of explicit controller and actions

This makes future refactoring easier.

3 years agoUpdate bundle
Tom Hughes [Wed, 10 Mar 2021 10:38:13 +0000 (10:38 +0000)]
Update bundle

3 years agoAdded natural=peninsula
Morten Bruhn [Tue, 9 Mar 2021 19:44:21 +0000 (20:44 +0100)]
Added natural=peninsula

3 years agoAdded natural=coastline
Morten Bruhn [Tue, 9 Mar 2021 19:42:57 +0000 (20:42 +0100)]
Added natural=coastline

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 8 Mar 2021 14:57:34 +0000 (15:57 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3118'
Tom Hughes [Fri, 5 Mar 2021 15:50:34 +0000 (15:50 +0000)]
Merge remote-tracking branch 'upstream/pull/3118'

3 years agoRemove incidental additions
Quincy Morgan [Fri, 5 Mar 2021 15:37:22 +0000 (10:37 -0500)]
Remove incidental additions

3 years agoMerge branch 'master' into iD-2.19.6
Quincy Morgan [Fri, 5 Mar 2021 15:30:24 +0000 (10:30 -0500)]
Merge branch 'master' into iD-2.19.6

3 years agoRemove swfobject from Vendorfile as it is no longer used
Tom Hughes [Thu, 4 Mar 2021 14:46:02 +0000 (14:46 +0000)]
Remove swfobject from Vendorfile as it is no longer used

3 years agoMerge remote-tracking branch 'upstream/pull/3121'
Tom Hughes [Thu, 4 Mar 2021 13:45:34 +0000 (13:45 +0000)]
Merge remote-tracking branch 'upstream/pull/3121'

3 years agoMerge remote-tracking branch 'upstream/pull/3120'
Tom Hughes [Thu, 4 Mar 2021 13:45:31 +0000 (13:45 +0000)]
Merge remote-tracking branch 'upstream/pull/3120'

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 4 Mar 2021 13:05:49 +0000 (14:05 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoRemove CSS overrides for the login page at small screen sizes
Andy Allan [Thu, 4 Mar 2021 11:08:11 +0000 (11:08 +0000)]
Remove CSS overrides for the login page at small screen sizes

Some of these selectors no longer apply, and the one that did just
made the behaviour worse, so they are all no longer required.

3 years agoPrevent input group wrapping when sidebar is resized
Andy Allan [Thu, 4 Mar 2021 11:04:47 +0000 (11:04 +0000)]
Prevent input group wrapping when sidebar is resized

Fixes #3119

3 years agoUpdate to iD v2.19.6
Quincy Morgan [Wed, 3 Mar 2021 19:21:42 +0000 (14:21 -0500)]
Update to iD v2.19.6

3 years agoMerge remote-tracking branch 'upstream/pull/3117'
Tom Hughes [Wed, 3 Mar 2021 18:43:34 +0000 (18:43 +0000)]
Merge remote-tracking branch 'upstream/pull/3117'

3 years agoAdd a small margin before the changesets more button
Andy Allan [Wed, 3 Mar 2021 17:39:42 +0000 (17:39 +0000)]
Add a small margin before the changesets more button

See also #2717

3 years agoRemove unnecessary margin-tops
Andy Allan [Wed, 3 Mar 2021 17:16:31 +0000 (17:16 +0000)]
Remove unnecessary margin-tops

3 years agoRemove final uses of the deemphasize class
Andy Allan [Wed, 3 Mar 2021 15:51:11 +0000 (15:51 +0000)]
Remove final uses of the deemphasize class

3 years agoRemove the old richtext_area helper
Andy Allan [Wed, 3 Mar 2021 15:34:16 +0000 (15:34 +0000)]
Remove the old richtext_area helper

This has been superseded by the `f.richtext_field` custom form builder.

3 years agoUse a 307 Temporary Redirect to redirect to authentication
Tom Hughes [Wed, 3 Mar 2021 09:27:33 +0000 (09:27 +0000)]
Use a 307 Temporary Redirect to redirect to authentication

When the user wants to enable an external authenticator we need
to redirect to omniauth but that now needs to be a POST so use a
redirect that preserves the POST method.

Fixes #3114

3 years agoFix new rubocop warnings
Tom Hughes [Tue, 2 Mar 2021 08:24:15 +0000 (08:24 +0000)]
Fix new rubocop warnings

3 years agoUpdate bundle
Tom Hughes [Tue, 2 Mar 2021 08:22:08 +0000 (08:22 +0000)]
Update bundle

3 years agoMerge remote-tracking branch 'upstream/pull/3113'
Tom Hughes [Tue, 2 Mar 2021 08:14:16 +0000 (08:14 +0000)]
Merge remote-tracking branch 'upstream/pull/3113'

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 1 Mar 2021 13:50:53 +0000 (14:50 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoBump eslint from 7.20.0 to 7.21.0
dependabot[bot] [Mon, 1 Mar 2021 05:05:49 +0000 (05:05 +0000)]
Bump eslint from 7.20.0 to 7.21.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.20.0 to 7.21.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.20.0...v7.21.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 Feb 2021 15:25:29 +0000 (16:25 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3109'
Tom Hughes [Wed, 24 Feb 2021 17:12:36 +0000 (17:12 +0000)]
Merge remote-tracking branch 'upstream/pull/3109'

3 years agoRemove standard-form CSS rules
Andy Allan [Wed, 24 Feb 2021 14:48:10 +0000 (14:48 +0000)]
Remove standard-form CSS rules

3 years agoConvert the search forms to bootstrap
Andy Allan [Wed, 10 Feb 2021 14:17:58 +0000 (14:17 +0000)]
Convert the search forms to bootstrap

This moves the forms to a flex grid, albeit with a little twiddling
to get things working in a compact space.

3 years agoMerge branch 'pull/3091'
Andy Allan [Wed, 24 Feb 2021 10:49:39 +0000 (10:49 +0000)]
Merge branch 'pull/3091'

3 years agoUse the bootstrap spacer variable as the basis for spacing calcuation, and match...
Andy Allan [Wed, 24 Feb 2021 10:35:28 +0000 (10:35 +0000)]
Use the bootstrap spacer variable as the basis for spacing calcuation, and match mb-1 definition

3 years agoUpdate bundle
Tom Hughes [Tue, 23 Feb 2021 18:56:55 +0000 (18:56 +0000)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Feb 2021 15:49:08 +0000 (16:49 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoTighten up cookie security
Tom Hughes [Fri, 19 Feb 2021 18:18:13 +0000 (18:18 +0000)]
Tighten up cookie security

Mark all cookies as Secure, and the cookies which are not
modified client side as HttpOnly.

3 years agoAdd btn-wrapper class
mxdanger [Thu, 18 Feb 2021 02:27:41 +0000 (18:27 -0800)]
Add btn-wrapper class

3 years agoMerge remote-tracking branch 'upstream/pull/3102'
Tom Hughes [Wed, 17 Feb 2021 18:55:55 +0000 (18:55 +0000)]
Merge remote-tracking branch 'upstream/pull/3102'

3 years agoRefactor the share panel to use bootstrap forms
Andy Allan [Wed, 17 Feb 2021 17:17:19 +0000 (17:17 +0000)]
Refactor the share panel to use bootstrap forms

3 years agoUse bootstrap form-check for overlay selection
Andy Allan [Wed, 17 Feb 2021 17:05:49 +0000 (17:05 +0000)]
Use bootstrap form-check for overlay selection

3 years agoMerge remote-tracking branch 'upstream/pull/3100'
Tom Hughes [Wed, 17 Feb 2021 11:56:53 +0000 (11:56 +0000)]
Merge remote-tracking branch 'upstream/pull/3100'

3 years agoBump composite_primary_keys to 12.0.8
Andy Allan [Wed, 17 Feb 2021 11:12:47 +0000 (11:12 +0000)]
Bump composite_primary_keys to 12.0.8

12.0.7 has been yanked

3 years agoMerge pull request #3083 from migurski/migurski/docker-compose-cleanups
Andy Allan [Wed, 17 Feb 2021 10:22:11 +0000 (10:22 +0000)]
Merge pull request #3083 from migurski/migurski/docker-compose-cleanups

Post-merge Docker Compose cleanup issues

3 years agoFix new rubocop warnings
Tom Hughes [Tue, 16 Feb 2021 21:14:54 +0000 (21:14 +0000)]
Fix new rubocop warnings

3 years agoUpdate bundle
Tom Hughes [Tue, 16 Feb 2021 21:10:28 +0000 (21:10 +0000)]
Update bundle

3 years agoValidate avatar images
Tom Hughes [Tue, 16 Feb 2021 17:37:18 +0000 (17:37 +0000)]
Validate avatar images

Closes #3097

3 years agoFix avatar mode update on file change
Tom Hughes [Tue, 16 Feb 2021 17:12:34 +0000 (17:12 +0000)]
Fix avatar mode update on file change

3 years agoMerge remote-tracking branch 'upstream/pull/3095'
Tom Hughes [Tue, 16 Feb 2021 08:10:49 +0000 (08:10 +0000)]
Merge remote-tracking branch 'upstream/pull/3095'

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 Feb 2021 13:52:55 +0000 (14:52 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoBump eslint from 7.19.0 to 7.20.0
dependabot[bot] [Mon, 15 Feb 2021 05:01:20 +0000 (05:01 +0000)]
Bump eslint from 7.19.0 to 7.20.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.19.0 to 7.20.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.19.0...v7.20.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoRemoved ENABLE_BOOTSNAP environment variable
Michal Migurski [Thu, 4 Feb 2021 19:27:10 +0000 (11:27 -0800)]
Removed ENABLE_BOOTSNAP environment variable