]> git.openstreetmap.org Git - rails.git/log
rails.git
3 years agoRefactor to use a heading class for height when using header-illustrations
Andy Allan [Wed, 21 Jul 2021 10:45:37 +0000 (11:45 +0100)]
Refactor to use a heading class for height when using header-illustrations

This fixes a glitch highlighted in #3259, where the css class stopped applying
when the view was moved to a different controller.

We're moving to having each view responsible for their layout, and commonly having
override classes explicitly in the relevant views. So we can follow that pattern here.

3 years agoUpdate bundle
Tom Hughes [Tue, 20 Jul 2021 17:10:03 +0000 (18:10 +0100)]
Update bundle

3 years agoMerge remote-tracking branch 'upstream/pull/3262'
Tom Hughes [Tue, 20 Jul 2021 17:09:07 +0000 (18:09 +0100)]
Merge remote-tracking branch 'upstream/pull/3262'

3 years agoBump eslint from 7.30.0 to 7.31.0
dependabot[bot] [Mon, 19 Jul 2021 23:00:50 +0000 (23:00 +0000)]
Bump eslint from 7.30.0 to 7.31.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.30.0 to 7.31.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.30.0...v7.31.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Jul 2021 11:09:27 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3251'
Tom Hughes [Sun, 18 Jul 2021 17:25:44 +0000 (18:25 +0100)]
Merge remote-tracking branch 'upstream/pull/3251'

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Jul 2021 11:10:37 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3258'
Tom Hughes [Wed, 14 Jul 2021 18:20:47 +0000 (19:20 +0100)]
Merge remote-tracking branch 'upstream/pull/3258'

3 years agoEnsure message destroy button has danger colour when showing the message, and add...
Andy Allan [Wed, 14 Jul 2021 17:54:23 +0000 (18:54 +0100)]
Ensure message destroy button has danger colour when showing the message, and add button to show page when viewing sent messages

3 years agoEnsure the message title shows in the heading for both sent and received messages
Andy Allan [Wed, 14 Jul 2021 17:40:02 +0000 (18:40 +0100)]
Ensure the message title shows in the heading for both sent and received messages

I'm not sure why they were ever different.

3 years agoAdd a title in the heading to match the main menu text
Andy Allan [Wed, 14 Jul 2021 17:36:52 +0000 (18:36 +0100)]
Add a title in the heading to match the main menu text

3 years agoConvert mailbox navigation to use tabs
Andy Allan [Wed, 14 Jul 2021 17:34:39 +0000 (18:34 +0100)]
Convert mailbox navigation to use tabs

3 years agoUpdate bundle
Tom Hughes [Wed, 14 Jul 2021 10:28:03 +0000 (11:28 +0100)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Jul 2021 11:08:34 +0000 (13:08 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Jul 2021 11:09:12 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3253'
Tom Hughes [Tue, 6 Jul 2021 23:33:11 +0000 (00:33 +0100)]
Merge remote-tracking branch 'upstream/pull/3253'

3 years agoBump coverallsapp/github-action from 1.1.2 to 1.1.3
dependabot[bot] [Tue, 6 Jul 2021 23:04:44 +0000 (23:04 +0000)]
Bump coverallsapp/github-action from 1.1.2 to 1.1.3

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.1.2 to 1.1.3.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v1.1.2...1.1.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoAllow cross origin access to OAuth 2 token endpoints
Tom Hughes [Tue, 6 Jul 2021 18:30:05 +0000 (19:30 +0100)]
Allow cross origin access to OAuth 2 token endpoints

3 years agoAllow cross origin access to trace data
Tom Hughes [Tue, 6 Jul 2021 18:29:42 +0000 (19:29 +0100)]
Allow cross origin access to trace data

Fixes #3252

3 years agoUpdate bundle
Tom Hughes [Tue, 6 Jul 2021 17:09:00 +0000 (18:09 +0100)]
Update bundle

3 years agoAllow acls to match on parent domains
Tom Hughes [Tue, 6 Jul 2021 09:12:51 +0000 (10:12 +0100)]
Allow acls to match on parent domains

3 years agoAdded historic=rune_stone to en.yml
Morten Bruhn [Tue, 6 Jul 2021 09:13:16 +0000 (11:13 +0200)]
Added historic=rune_stone to en.yml

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 5 Jul 2021 11:10:43 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3247'
Tom Hughes [Fri, 2 Jul 2021 23:11:47 +0000 (00:11 +0100)]
Merge remote-tracking branch 'upstream/pull/3247'

3 years agoBump eslint from 7.29.0 to 7.30.0
dependabot[bot] [Fri, 2 Jul 2021 23:00:55 +0000 (23:00 +0000)]
Bump eslint from 7.29.0 to 7.30.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.29.0 to 7.30.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.29.0...v7.30.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoMerge remote-tracking branch 'upstream/pull/3246'
Tom Hughes [Fri, 2 Jul 2021 12:56:50 +0000 (13:56 +0100)]
Merge remote-tracking branch 'upstream/pull/3246'

3 years agoUpdate banner FAQ.
Paul Norman [Fri, 2 Jul 2021 12:49:06 +0000 (05:49 -0700)]
Update banner FAQ.

This adds a contrast requirement for the upper-right corner so the
'X' can be seen. It also adds a requirement that PRs be created
before the banner needs to be shown, in order to allow for proper
review.

3 years agoCheck that the permission is non-zero
Tom Hughes [Thu, 1 Jul 2021 15:26:17 +0000 (16:26 +0100)]
Check that the permission is non-zero

Fixes #3241

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 1 Jul 2021 11:50:13 +0000 (13:50 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3240'
Tom Hughes [Wed, 30 Jun 2021 21:25:02 +0000 (22:25 +0100)]
Merge remote-tracking branch 'upstream/pull/3240'

3 years agoMerge remote-tracking branch 'upstream/pull/3239'
Tom Hughes [Wed, 30 Jun 2021 18:14:47 +0000 (19:14 +0100)]
Merge remote-tracking branch 'upstream/pull/3239'

3 years agoRefactor About header to use bootstrap and flex
Andy Allan [Wed, 30 Jun 2021 14:21:49 +0000 (15:21 +0100)]
Refactor About header to use bootstrap and flex

This reduces the amount of custom CSS required for the layout, and
makes it responsive on small screen sizes.

3 years agoAlight the max-width of the content to one of the bootstrap breakpoints
Andy Allan [Wed, 30 Jun 2021 10:48:12 +0000 (11:48 +0100)]
Alight the max-width of the content to one of the bootstrap breakpoints

This makes various things easier to reason about, as well as making
some grid things easier too.

3 years agoUse bootstrap font family
Andy Allan [Wed, 30 Jun 2021 10:29:34 +0000 (11:29 +0100)]
Use bootstrap font family

This contains and expanded list of fonts, covering more platforms
and edge cases than ours, so there's no need to override.

3 years agoRemove some default styling from body
Andy Allan [Wed, 30 Jun 2021 10:17:30 +0000 (11:17 +0100)]
Remove some default styling from body

These mirror, either exactly or pretty close to exactly, what is set
by the bootstrap reboot style, so there's no need for us to duplicate.

3 years agoRemove some references to webmaster
Tom Hughes [Tue, 29 Jun 2021 18:22:31 +0000 (19:22 +0100)]
Remove some references to webmaster

3 years agoFix some broken translation lookups
Tom Hughes [Tue, 29 Jun 2021 18:14:50 +0000 (19:14 +0100)]
Fix some broken translation lookups

3 years agoFix new erblint warnings
Tom Hughes [Tue, 29 Jun 2021 17:42:34 +0000 (18:42 +0100)]
Fix new erblint warnings

3 years agoFix new rubocop warnings
Tom Hughes [Tue, 29 Jun 2021 17:29:00 +0000 (18:29 +0100)]
Fix new rubocop warnings

3 years agoUpdate bundle
Tom Hughes [Tue, 29 Jun 2021 17:21:22 +0000 (18:21 +0100)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 28 Jun 2021 13:36:14 +0000 (15:36 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3235'
Tom Hughes [Sun, 27 Jun 2021 17:44:05 +0000 (18:44 +0100)]
Merge remote-tracking branch 'upstream/pull/3235'

3 years agoMake /api/0.6/permissions work for OAuth 2 clients
Tom Hughes [Sat, 26 Jun 2021 23:38:16 +0000 (00:38 +0100)]
Make /api/0.6/permissions work for OAuth 2 clients

3 years agoBump leaflet.locatecontrol from 0.73.0 to 0.74.0
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>
3 years agoRestore browse-section class to changeset view
Tom Hughes [Fri, 25 Jun 2021 19:26:51 +0000 (20:26 +0100)]
Restore browse-section class to changeset view

Fixes #3234

3 years agoUpdate to rails 6.1.4
Tom Hughes [Thu, 24 Jun 2021 21:22:54 +0000 (22:22 +0100)]
Update to rails 6.1.4

3 years agoRevert "Localisation updates from https://translatewiki.net."
Tom Hughes [Thu, 24 Jun 2021 19:48:14 +0000 (20:48 +0100)]
Revert "Localisation updates from https://translatewiki.net."

This reverts commit 93660ec9e86b683bb7bce6e0f51c8affcf3066f7.

3 years agoEnable access token reuse for OAuth 2
Tom Hughes [Thu, 24 Jun 2021 19:35:29 +0000 (20:35 +0100)]
Enable access token reuse for OAuth 2

3 years agoUpdate doorkeeper configuration file from master template
Tom Hughes [Thu, 24 Jun 2021 19:28:00 +0000 (20:28 +0100)]
Update doorkeeper configuration file from master template

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 24 Jun 2021 10:06:09 +0000 (12:06 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoUpdate bundle
Tom Hughes [Thu, 24 Jun 2021 07:44:03 +0000 (08:44 +0100)]
Update bundle

3 years agoMerge remote-tracking branch 'upstream/pull/3177'
Tom Hughes [Thu, 24 Jun 2021 07:43:18 +0000 (08:43 +0100)]
Merge remote-tracking branch 'upstream/pull/3177'

3 years agoMerge remote-tracking branch 'upstream/pull/3232'
Tom Hughes [Wed, 23 Jun 2021 20:36:57 +0000 (21:36 +0100)]
Merge remote-tracking branch 'upstream/pull/3232'

3 years agoRefactor terms declined flash message to use a partial
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.

3 years agoRefactor flash messages to use a flex row for positioning
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.

3 years agoEnsure that all floated elements in the header stay within it
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.

3 years agoRemove unnecessary padding-bottom override on the header h1
Andy Allan [Wed, 23 Jun 2021 16:20:04 +0000 (17:20 +0100)]
Remove unnecessary padding-bottom override on the header h1

3 years agoUse paragraphs instead of line breaks, and avoid using html in translation strings
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

3 years agoUse hash-based flash objects to render complex flash messages
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

3 years agoDon't mark banner cookies as HttpOnly
Tom Hughes [Wed, 23 Jun 2021 14:08:45 +0000 (15:08 +0100)]
Don't mark banner cookies as HttpOnly

Fixes #3231

3 years agoAvoid accidental locale changes in tests
Tom Hughes [Tue, 22 Jun 2021 18:05:55 +0000 (19:05 +0100)]
Avoid accidental locale changes in tests

3 years agoFix new ruboop warnings
Tom Hughes [Tue, 22 Jun 2021 17:34:15 +0000 (18:34 +0100)]
Fix new ruboop warnings

3 years agoUpdate bundle
Tom Hughes [Tue, 22 Jun 2021 17:18:47 +0000 (18:18 +0100)]
Update bundle

3 years agoMerge remote-tracking branch 'upstream/pull/3229'
Tom Hughes [Mon, 21 Jun 2021 21:21:09 +0000 (22:21 +0100)]
Merge remote-tracking branch 'upstream/pull/3229'

3 years agoadd banner for SotM 2021
Martin Raifer [Mon, 21 Jun 2021 19:02:00 +0000 (21:02 +0200)]
add banner for SotM 2021

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 21 Jun 2021 10:36:39 +0000 (12:36 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3227'
Tom Hughes [Sat, 19 Jun 2021 13:45:23 +0000 (14:45 +0100)]
Merge remote-tracking branch 'upstream/pull/3227'

3 years agoBump eslint from 7.28.0 to 7.29.0
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>
3 years agoRemove the Yahoo OpenID link as they no longer support OpenID
Tom Hughes [Thu, 17 Jun 2021 21:33:05 +0000 (22:33 +0100)]
Remove the Yahoo OpenID link as they no longer support OpenID

3 years agoMerge remote-tracking branch 'upstream/pull/3226'
Tom Hughes [Wed, 16 Jun 2021 17:07:38 +0000 (18:07 +0100)]
Merge remote-tracking branch 'upstream/pull/3226'

3 years agoMerge remote-tracking branch 'upstream/pull/3225'
Tom Hughes [Wed, 16 Jun 2021 17:06:40 +0000 (18:06 +0100)]
Merge remote-tracking branch 'upstream/pull/3225'

3 years agoMerge remote-tracking branch 'upstream/pull/3224'
Tom Hughes [Wed, 16 Jun 2021 17:04:02 +0000 (18:04 +0100)]
Merge remote-tracking branch 'upstream/pull/3224'

3 years agoMerge remote-tracking branch 'upstream/pull/3222'
Tom Hughes [Wed, 16 Jun 2021 17:01:43 +0000 (18:01 +0100)]
Merge remote-tracking branch 'upstream/pull/3222'

3 years agoWrap the rss and upload buttons in a div, with suitable padding for both vertical...
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.

3 years agoRework tabs to use flexbox
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

3 years agoMake tab labels into nouns that describe what's on the tab
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.

3 years agoRearrange tabs for inter-page consistency
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.

3 years agoFixed remaining erblint complaint
Michal Migurski [Sat, 27 Feb 2021 16:21:35 +0000 (08:21 -0800)]
Fixed remaining erblint complaint

3 years agoFixed missing translation test failures
Michal Migurski [Sat, 27 Feb 2021 16:15:41 +0000 (08:15 -0800)]
Fixed missing translation test failures

3 years agoFix erblint complaints
Michal Migurski [Sat, 27 Feb 2021 16:13:10 +0000 (08:13 -0800)]
Fix erblint complaints

3 years agoTraces#index: Introduce tab navigation, fix tag-filter
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`

3 years agoRemove unused padding classes
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.

3 years agoRework sidebar to use padding on the sidebar_content div
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).

3 years agoFix the email address that's suggested for whitelisting
Andy Allan [Wed, 16 Jun 2021 14:37:40 +0000 (15:37 +0100)]
Fix the email address that's suggested for whitelisting

Refs #3215

3 years agoRework the routing credit to use a bootstrap class
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.

3 years agoMatch the width of the overlay-sidebar on narrow screens to the width on full-sized...
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.

3 years agoSkip intermediate lengths when testing tag validity
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.

3 years agoUpdate bundle
Tom Hughes [Tue, 15 Jun 2021 17:39:24 +0000 (18:39 +0100)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 14 Jun 2021 07:58:54 +0000 (09:58 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 10 Jun 2021 14:55:57 +0000 (16:55 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3217'
Tom Hughes [Wed, 9 Jun 2021 16:46:45 +0000 (17:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3217'

3 years agoMerge remote-tracking branch 'upstream/pull/3216'
Tom Hughes [Wed, 9 Jun 2021 16:46:11 +0000 (17:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3216'

3 years agoSet updated_by when resolving issues
Andy Allan [Wed, 9 Jun 2021 14:47:31 +0000 (15:47 +0100)]
Set updated_by when resolving issues

Refs #3211

3 years agoMerge pull request #3208 from osm-hr/update-rcn-color
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

3 years agoFix case when user block durations are slightly negative
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

3 years agoEnsure that short duration blockss are shown as '0 hours'
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

3 years agoDrop last vestiges of ruby 2.5 support
Tom Hughes [Tue, 8 Jun 2021 19:33:25 +0000 (20:33 +0100)]
Drop last vestiges of ruby 2.5 support

3 years agoUpdate bundle
Tom Hughes [Tue, 8 Jun 2021 18:44:48 +0000 (19:44 +0100)]
Update bundle

3 years agoMerge remote-tracking branch 'upstream/pull/3214'
Tom Hughes [Tue, 8 Jun 2021 18:41:39 +0000 (19:41 +0100)]
Merge remote-tracking branch 'upstream/pull/3214'

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 7 Jun 2021 12:58:59 +0000 (14:58 +0200)]
Localisation updates from https://translatewiki.net.