]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sun, 27 Jun 2021 17:42:47 +0000 (18:42 +0100)]
Switch web site to use OAuth 2
Tom Hughes [Sun, 27 Jun 2021 17:44:05 +0000 (18:44 +0100)]
Merge remote-tracking branch 'upstream/pull/3235'
Tom Hughes [Sat, 26 Jun 2021 23:38:16 +0000 (00:38 +0100)]
Make /api/0.6/permissions work for OAuth 2 clients
dependabot[bot] [Fri, 25 Jun 2021 23:00:44 +0000 (23:00 +0000)]
Bump leaflet.locatecontrol from 0.73.0 to 0.74.0
Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.73.0 to 0.74.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.73.0...v0.74.0)
---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Fri, 25 Jun 2021 19:26:51 +0000 (20:26 +0100)]
Restore browse-section class to changeset view
Fixes #3234
Tom Hughes [Thu, 24 Jun 2021 21:22:54 +0000 (22:22 +0100)]
Update to rails 6.1.4
Tom Hughes [Thu, 24 Jun 2021 19:48:14 +0000 (20:48 +0100)]
Revert "Localisation updates from https://translatewiki.net."
This reverts commit
93660ec9e86b683bb7bce6e0f51c8affcf3066f7 .
Tom Hughes [Thu, 24 Jun 2021 19:35:29 +0000 (20:35 +0100)]
Enable access token reuse for OAuth 2
Tom Hughes [Thu, 24 Jun 2021 19:28:00 +0000 (20:28 +0100)]
Update doorkeeper configuration file from master template
translatewiki.net [Thu, 24 Jun 2021 10:06:09 +0000 (12:06 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 24 Jun 2021 07:44:03 +0000 (08:44 +0100)]
Update bundle
Tom Hughes [Thu, 24 Jun 2021 07:43:18 +0000 (08:43 +0100)]
Merge remote-tracking branch 'upstream/pull/3177'
Tom Hughes [Wed, 23 Jun 2021 20:36:57 +0000 (21:36 +0100)]
Merge remote-tracking branch 'upstream/pull/3232'
Andy Allan [Wed, 23 Jun 2021 19:09:19 +0000 (20:09 +0100)]
Refactor terms declined flash message to use a partial
This allows us to include a link in the flash message, without having
to use html_safe. Also refactor to avoid having html angle brackets in
the translation strings, while still allowing locale-specific urls.
Andy Allan [Wed, 23 Jun 2021 16:38:54 +0000 (17:38 +0100)]
Refactor flash messages to use a flex row for positioning
This works better for narrow widths and needs less custom CSS.
Andy Allan [Wed, 23 Jun 2021 16:20:48 +0000 (17:20 +0100)]
Ensure that all floated elements in the header stay within it
In certain circumstance, due to either extreme narrow screen widths,
or due to padding on floating elements exceeding the header height,
some things could appear outwith the header. This clearfix avoids
this from happening.
Andy Allan [Wed, 23 Jun 2021 16:20:04 +0000 (17:20 +0100)]
Remove unnecessary padding-bottom override on the header h1
Andy Allan [Wed, 23 Jun 2021 15:43:35 +0000 (16:43 +0100)]
Use paragraphs instead of line breaks, and avoid using html in translation strings
Andy Allan [Wed, 23 Jun 2021 15:26:50 +0000 (16:26 +0100)]
Use hash-based flash objects to render complex flash messages
Since flash objects can only be String, Hash or Array (notably excluding SafeBuffers), then this approach is necessary to render complex html in a safe manner.
Each local can be treated as an (unsafe) string, and therefore escaped normally when rendered into the template. The template (and translation strings) can
contain html since they are no longer stored in the flash as a plain string.
Fixes #3215
Tom Hughes [Wed, 23 Jun 2021 14:08:45 +0000 (15:08 +0100)]
Don't mark banner cookies as HttpOnly
Fixes #3231
Tom Hughes [Tue, 22 Jun 2021 18:05:55 +0000 (19:05 +0100)]
Avoid accidental locale changes in tests
Tom Hughes [Tue, 22 Jun 2021 17:34:15 +0000 (18:34 +0100)]
Fix new ruboop warnings
Tom Hughes [Tue, 22 Jun 2021 17:18:47 +0000 (18:18 +0100)]
Update bundle
Tom Hughes [Mon, 21 Jun 2021 21:21:09 +0000 (22:21 +0100)]
Merge remote-tracking branch 'upstream/pull/3229'
Martin Raifer [Mon, 21 Jun 2021 19:02:00 +0000 (21:02 +0200)]
add banner for SotM 2021
translatewiki.net [Mon, 21 Jun 2021 10:36:39 +0000 (12:36 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 19 Jun 2021 13:45:23 +0000 (14:45 +0100)]
Merge remote-tracking branch 'upstream/pull/3227'
dependabot[bot] [Fri, 18 Jun 2021 23:00:40 +0000 (23:00 +0000)]
Bump eslint from 7.28.0 to 7.29.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.28.0 to 7.29.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.28.0...v7.29.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Thu, 17 Jun 2021 21:33:05 +0000 (22:33 +0100)]
Remove the Yahoo OpenID link as they no longer support OpenID
Tom Hughes [Wed, 16 Jun 2021 17:07:38 +0000 (18:07 +0100)]
Merge remote-tracking branch 'upstream/pull/3226'
Tom Hughes [Wed, 16 Jun 2021 17:06:40 +0000 (18:06 +0100)]
Merge remote-tracking branch 'upstream/pull/3225'
Tom Hughes [Wed, 16 Jun 2021 17:04:02 +0000 (18:04 +0100)]
Merge remote-tracking branch 'upstream/pull/3224'
Tom Hughes [Wed, 16 Jun 2021 17:01:43 +0000 (18:01 +0100)]
Merge remote-tracking branch 'upstream/pull/3222'
Andy Allan [Wed, 16 Jun 2021 16:08:26 +0000 (17:08 +0100)]
Wrap the rss and upload buttons in a div, with suitable padding for both vertical and horizontal tab layouts
This ensures it looks right when the tabs are collapsed vertically.
Andy Allan [Wed, 16 Jun 2021 15:47:13 +0000 (16:47 +0100)]
Rework tabs to use flexbox
This improves the behaviour on small widths, where the tabs stack neatly. It also avoids the use of ml-auto which isn't RTL compatible.
The change in indentation is because it was previously coded with multiple li nested inside another li
Andy Allan [Wed, 16 Jun 2021 15:27:45 +0000 (16:27 +0100)]
Make tab labels into nouns that describe what's on the tab
I think that works better with tabs, whereas actions (verbs) work better with buttons.
Andy Allan [Wed, 16 Jun 2021 15:26:25 +0000 (16:26 +0100)]
Rearrange tabs for inter-page consistency
The all traces tab comes first, since it's shown on every page as you click around. Otherwise the tabs appear to be constantly rearranging themselves.
Michal Migurski [Sat, 27 Feb 2021 16:21:35 +0000 (08:21 -0800)]
Fixed remaining erblint complaint
Michal Migurski [Sat, 27 Feb 2021 16:15:41 +0000 (08:15 -0800)]
Fixed missing translation test failures
Michal Migurski [Sat, 27 Feb 2021 16:13:10 +0000 (08:13 -0800)]
Fix erblint complaints
Tobias Jordans [Sat, 2 Jan 2021 21:36:49 +0000 (22:36 +0100)]
Traces#index: Introduce tab navigation, fix tag-filter
- introduce bootstrap tabs to switch the views
- introduce `content_for :heading_class` to remove the padding below the bootstrap tabs
- update the rss-image to use a svg, adopted from https://icons.getbootstrap.com/icons/rss/ (without the outer border)
- move rss- and new-button away from the view-switching actions
- the `@tag` logic was broken. introduce new link to remove the tag-filter; the tabs keep the filter once given; use params[:tag] directly in the view
- use `&.` syntax nil-safety so we can remove `@display_name`
Andy Allan [Wed, 16 Jun 2021 14:14:42 +0000 (15:14 +0100)]
Remove unused padding classes
These were last used for sidebar padding, which is now handled more easily.
Andy Allan [Wed, 16 Jun 2021 14:09:48 +0000 (15:09 +0100)]
Rework sidebar to use padding on the sidebar_content div
This saves every header, list, paragraph etc having to sort out their own padding. The couple of instances where we want edge-to-edge can be acheived using the negative margin spacing utilities.
The padding is based on $spacer so that it can be adjusted automatically via bootstrap configuration.
This also means that we can remove many (mis-)uses of the browse-section class, which is only supposed to be for cases where there are multiple browse-sections in sequence (e.g. multiple nodes in the node history browse pages).
Andy Allan [Wed, 16 Jun 2021 14:37:40 +0000 (15:37 +0100)]
Fix the email address that's suggested for whitelisting
Refs #3215
Andy Allan [Wed, 16 Jun 2021 12:28:33 +0000 (13:28 +0100)]
Rework the routing credit to use a bootstrap class
The padding is unnecessary given it's in a paragraph anyway.
Andy Allan [Wed, 16 Jun 2021 11:07:04 +0000 (12:07 +0100)]
Match the width of the overlay-sidebar on narrow screens to the width on full-sized screens
It's not clear why they are different widths, since the non-overlay sidebar doesn't change.
Andy Allan [Wed, 16 Jun 2021 08:53:57 +0000 (09:53 +0100)]
Skip intermediate lengths when testing tag validity
It's really the upper and lower boundaries that we want to check,
and it's reasonable to assume all the intermediate values will work
fine if the boundary values are tested.
This also saves about 75% of the time taken and almost 85% of the
assertions when running all the model tests.
Tom Hughes [Tue, 15 Jun 2021 17:39:24 +0000 (18:39 +0100)]
Update bundle
translatewiki.net [Mon, 14 Jun 2021 07:58:54 +0000 (09:58 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 10 Jun 2021 14:55:57 +0000 (16:55 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 9 Jun 2021 16:46:45 +0000 (17:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3217'
Tom Hughes [Wed, 9 Jun 2021 16:46:11 +0000 (17:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3216'
Andy Allan [Wed, 9 Jun 2021 14:47:31 +0000 (15:47 +0100)]
Set updated_by when resolving issues
Refs #3211
Andy Allan [Wed, 9 Jun 2021 14:29:57 +0000 (15:29 +0100)]
Merge pull request #3208 from osm-hr/update-rcn-color
fix map key color for regional OpenCycleMap
Andy Allan [Wed, 9 Jun 2021 14:14:14 +0000 (15:14 +0100)]
Fix case when user block durations are slightly negative
The output from ActiveSupport::Duration is wildly unhelpful in those cases
Fixes #3210
Andy Allan [Wed, 9 Jun 2021 13:17:56 +0000 (14:17 +0100)]
Ensure that short duration blockss are shown as '0 hours'
Passing `:count => nil` means that i18n.t will return the hash of translations, so use a default value of 0 when checking for hours to prevent this.
Refs #3210
Tom Hughes [Tue, 8 Jun 2021 19:33:25 +0000 (20:33 +0100)]
Drop last vestiges of ruby 2.5 support
Tom Hughes [Tue, 8 Jun 2021 18:44:48 +0000 (19:44 +0100)]
Update bundle
Tom Hughes [Tue, 8 Jun 2021 18:41:39 +0000 (19:41 +0100)]
Merge remote-tracking branch 'upstream/pull/3214'
translatewiki.net [Mon, 7 Jun 2021 12:58:59 +0000 (14:58 +0200)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Mon, 7 Jun 2021 05:01:26 +0000 (05:01 +0000)]
Bump eslint from 7.27.0 to 7.28.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.27.0 to 7.28.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.27.0...v7.28.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Sat, 5 Jun 2021 06:40:55 +0000 (07:40 +0100)]
Fix erblint warnings
Tom Hughes [Fri, 4 Jun 2021 20:49:53 +0000 (21:49 +0100)]
Set a referrer policy
Tom Hughes [Fri, 4 Jun 2021 20:10:32 +0000 (21:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3213'
Tom Hughes [Fri, 4 Jun 2021 20:09:26 +0000 (21:09 +0100)]
Merge remote-tracking branch 'upstream/pull/3212'
Robbendebiene [Fri, 4 Jun 2021 14:48:33 +0000 (16:48 +0200)]
Added missing dependency for fedora install
Robbendebiene [Fri, 4 Jun 2021 14:29:08 +0000 (16:29 +0200)]
fixed nodejs package name for fedora
translatewiki.net [Thu, 3 Jun 2021 13:24:16 +0000 (15:24 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 1 Jun 2021 17:27:50 +0000 (18:27 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 1 Jun 2021 17:25:21 +0000 (18:25 +0100)]
Update bundle
translatewiki.net [Mon, 31 May 2021 08:10:52 +0000 (10:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 28 May 2021 06:27:11 +0000 (07:27 +0100)]
Merge remote-tracking branch 'upstream/pull/3209'
dependabot[bot] [Fri, 28 May 2021 05:47:37 +0000 (05:47 +0000)]
Bump actions/cache from 2.1.5 to 2.1.6
Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6)
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 27 May 2021 13:49:57 +0000 (15:49 +0200)]
Localisation updates from https://translatewiki.net.
Matija Nalis [Tue, 25 May 2021 20:48:38 +0000 (22:48 +0200)]
fix map key color for regional OpenCycleMap, as it changed from light cyan to purple on the map.
Closes: https://github.com/openstreetmap/openstreetmap-website/issues/2785
Tom Hughes [Tue, 25 May 2021 17:27:19 +0000 (18:27 +0100)]
Update bundle
Tom Hughes [Tue, 25 May 2021 14:30:55 +0000 (15:30 +0100)]
Merge remote-tracking branch 'upstream/pull/3206'
dependabot[bot] [Tue, 25 May 2021 05:01:10 +0000 (05:01 +0000)]
Bump ohauth from 1.0.0 to 1.0.1
Bumps [ohauth](https://github.com/osmlab/ohauth) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/osmlab/ohauth/releases)
- [Changelog](https://github.com/osmlab/ohauth/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/ohauth/compare/v1.0.0...v1.0.1)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Mon, 24 May 2021 17:17:40 +0000 (18:17 +0100)]
Merge remote-tracking branch 'upstream/pull/3202'
translatewiki.net [Mon, 24 May 2021 12:14:01 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Mon, 24 May 2021 05:01:37 +0000 (05:01 +0000)]
Bump eslint from 7.26.0 to 7.27.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.26.0 to 7.27.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.26.0...v7.27.0)
Signed-off-by: dependabot[bot] <support@github.com>
Andy Allan [Thu, 20 May 2021 18:13:17 +0000 (19:13 +0100)]
Fix translation text
Tom Hughes [Thu, 20 May 2021 17:17:39 +0000 (18:17 +0100)]
Merge remote-tracking branch 'upstream/pull/3200'
Tom Hughes [Wed, 19 May 2021 17:44:41 +0000 (18:44 +0100)]
Fix downloading of image variants
Andy Allan [Wed, 19 May 2021 15:21:17 +0000 (16:21 +0100)]
Use built-in translation lookups for form helps
Andy Allan [Wed, 12 May 2021 16:40:21 +0000 (17:40 +0100)]
Use Update and Register as actions, to be consistent with client_applications
Andy Allan [Wed, 12 May 2021 11:04:56 +0000 (12:04 +0100)]
Rework some of the OAuth2 views, adding links and messages when there are no applications.
Andy Allan [Wed, 19 May 2021 10:02:41 +0000 (11:02 +0100)]
Switch to using 'rails test:all' in documentation and CI
Fixes #3116.
This allows us to drop our custom patch for running system tests,
as well as opening up all the usual rails test goodies like running
individual files or directories.
Tom Hughes [Tue, 18 May 2021 11:12:04 +0000 (12:12 +0100)]
Allow OAuth 2 authorizations to redirect to anywhere
Tom Hughes [Wed, 12 May 2021 20:55:00 +0000 (21:55 +0100)]
Show scope names in application views
Tom Hughes [Tue, 20 Apr 2021 17:52:57 +0000 (18:52 +0100)]
Allow OAuth 2 to redirect to plain HTTP for localhost
Tom Hughes [Thu, 15 Oct 2020 21:07:34 +0000 (22:07 +0100)]
Add tests for OAuth2
Tom Hughes [Thu, 27 Aug 2020 17:44:50 +0000 (18:44 +0100)]
Add support for OAuth2 using doorkeeper
Tom Hughes [Tue, 18 May 2021 07:29:51 +0000 (08:29 +0100)]
Update bundle
Tom Hughes [Tue, 18 May 2021 07:26:17 +0000 (08:26 +0100)]
Merge remote-tracking branch 'upstream/pull/3199'
dependabot[bot] [Tue, 18 May 2021 01:34:02 +0000 (01:34 +0000)]
Bump puma from 5.3.0 to 5.3.1
Bumps [puma](https://github.com/puma/puma) from 5.3.0 to 5.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.3.0...v5.3.1)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Mon, 17 May 2021 18:29:12 +0000 (19:29 +0100)]
Enable variant tracking for Active Storage
Tom Hughes [Mon, 17 May 2021 18:28:20 +0000 (19:28 +0100)]
Fix eslint warnings
Tom Hughes [Mon, 17 May 2021 18:15:55 +0000 (19:15 +0100)]
Enable some more rails 6.1 defaults
Tom Hughes [Mon, 17 May 2021 18:06:43 +0000 (19:06 +0100)]
Mark javascript issued cookies with SameSite=Lax