]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Wed, 30 Sep 2020 11:17:43 +0000 (13:17 +0200)]
Remove unused locale scripts
We no longer need these scripts, given our current translatewiki workflows
mmd-osm [Fri, 18 Sep 2020 19:04:38 +0000 (21:04 +0200)]
API User details: format tweaks
- _show_ to return single user only
- remove nesting for languages
mmd-osm [Wed, 16 Sep 2020 20:13:19 +0000 (22:13 +0200)]
Json user details: unit tests
mmd-osm [Wed, 16 Sep 2020 18:29:37 +0000 (20:29 +0200)]
Fix unit test, assume application/xml instead of text/xml
mmd-osm [Sun, 6 Sep 2020 20:11:23 +0000 (22:11 +0200)]
API User details JSON format
Tom Hughes [Fri, 4 Sep 2020 10:24:19 +0000 (11:24 +0100)]
Merge remote-tracking branch 'upstream/pull/2810'
dependabot[bot] [Fri, 4 Sep 2020 05:01:12 +0000 (05:01 +0000)]
Bump leaflet from 1.6.0 to 1.7.1
Bumps [leaflet](https://github.com/Leaflet/Leaflet) from 1.6.0 to 1.7.1.
- [Release notes](https://github.com/Leaflet/Leaflet/releases)
- [Changelog](https://github.com/Leaflet/Leaflet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Leaflet/Leaflet/compare/v1.6.0...v1.7.1)
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 3 Sep 2020 14:48:11 +0000 (16:48 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 2 Sep 2020 17:54:55 +0000 (18:54 +0100)]
Fix rubocop Style/SoleNestedConditional warnings
Tom Hughes [Wed, 2 Sep 2020 17:27:11 +0000 (18:27 +0100)]
Fix rubocop Style/CombinableLoops warnings
Tom Hughes [Wed, 2 Sep 2020 06:19:03 +0000 (07:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2806'
Tom Hughes [Wed, 2 Sep 2020 06:18:35 +0000 (07:18 +0100)]
Merge remote-tracking branch 'upstream/pull/2805'
Tom Hughes [Wed, 2 Sep 2020 06:18:21 +0000 (07:18 +0100)]
Handle new rubocop warnings
Tom Hughes [Wed, 2 Sep 2020 06:11:47 +0000 (07:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2804'
dependabot[bot] [Wed, 2 Sep 2020 05:01:33 +0000 (05:01 +0000)]
Bump eslint from 7.7.0 to 7.8.1
Bumps [eslint](https://github.com/eslint/eslint) from 7.7.0 to 7.8.1.
- [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.7.0...v7.8.1)
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Wed, 2 Sep 2020 05:01:21 +0000 (05:01 +0000)]
Bump minitest from 5.14.1 to 5.14.2
Bumps [minitest](https://github.com/seattlerb/minitest) from 5.14.1 to 5.14.2.
- [Release notes](https://github.com/seattlerb/minitest/releases)
- [Changelog](https://github.com/seattlerb/minitest/blob/master/History.rdoc)
- [Commits](https://github.com/seattlerb/minitest/compare/v5.14.1...v5.14.2)
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Wed, 2 Sep 2020 05:01:05 +0000 (05:01 +0000)]
Bump rubocop from 0.89.1 to 0.90.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.89.1 to 0.90.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.89.1...v0.90.0)
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Mon, 31 Aug 2020 14:16:14 +0000 (16:16 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 31 Aug 2020 07:29:05 +0000 (08:29 +0100)]
Merge remote-tracking branch 'upstream/pull/2802'
dependabot[bot] [Mon, 31 Aug 2020 05:01:08 +0000 (05:01 +0000)]
Bump omniauth-facebook from 6.0.0 to 7.0.0
Bumps [omniauth-facebook](https://github.com/mkdynamic/omniauth-facebook) from 6.0.0 to 7.0.0.
- [Release notes](https://github.com/mkdynamic/omniauth-facebook/releases)
- [Changelog](https://github.com/simi/omniauth-facebook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mkdynamic/omniauth-facebook/compare/v6.0.0...v7.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Fri, 28 Aug 2020 08:09:12 +0000 (09:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2797'
Tom Hughes [Fri, 28 Aug 2020 08:08:28 +0000 (09:08 +0100)]
Make embed.js depend on the settings
dependabot[bot] [Fri, 28 Aug 2020 05:01:15 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.79.0 to 1.79.1
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.79.0 to 1.79.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 27 Aug 2020 13:56:58 +0000 (15:56 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 26 Aug 2020 07:27:30 +0000 (08:27 +0100)]
Merge remote-tracking branch 'upstream/pull/2794'
dependabot[bot] [Wed, 26 Aug 2020 05:01:04 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.78.0 to 1.79.0
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.78.0 to 1.79.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Tue, 25 Aug 2020 19:57:50 +0000 (20:57 +0100)]
Attempt to modernise vagrant configuration
Tom Hughes [Tue, 25 Aug 2020 07:09:57 +0000 (08:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2792'
dependabot[bot] [Tue, 25 Aug 2020 05:01:09 +0000 (05:01 +0000)]
Bump autoprefixer-rails from 9.8.6.2 to 9.8.6.3
Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 9.8.6.2 to 9.8.6.3.
- [Release notes](https://github.com/ai/autoprefixer-rails/releases)
- [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ai/autoprefixer-rails/compare/9.8.6.2...9.8.6.3)
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Mon, 24 Aug 2020 13:31:01 +0000 (15:31 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 23 Aug 2020 09:41:39 +0000 (10:41 +0100)]
Only show the "too many messages" error once
Fixes #2790
Tom Hughes [Sat, 22 Aug 2020 15:15:21 +0000 (16:15 +0100)]
Merge remote-tracking branch 'upstream/pull/2786'
Tom Hughes [Sat, 22 Aug 2020 15:14:37 +0000 (16:14 +0100)]
Extend cleanup script to cleanup old OAuth tokens
translatewiki.net [Fri, 21 Aug 2020 15:28:58 +0000 (17:28 +0200)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Fri, 21 Aug 2020 05:01:03 +0000 (05:01 +0000)]
Bump autoprefixer-rails from 9.8.6.1 to 9.8.6.2
Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 9.8.6.1 to 9.8.6.2.
- [Release notes](https://github.com/ai/autoprefixer-rails/releases)
- [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ai/autoprefixer-rails/compare/9.8.6.1...9.8.6.2)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Thu, 20 Aug 2020 18:08:09 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/2784'
dependabot[bot] [Thu, 20 Aug 2020 05:00:58 +0000 (05:00 +0000)]
Bump canonical-rails from 0.2.8 to 0.2.9
Bumps [canonical-rails](https://github.com/jumph4x/canonical-rails) from 0.2.8 to 0.2.9.
- [Release notes](https://github.com/jumph4x/canonical-rails/releases)
- [Commits](https://github.com/jumph4x/canonical-rails/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Wed, 19 Aug 2020 20:44:24 +0000 (21:44 +0100)]
Allow CDN URL for the embed page to be configured
Tom Hughes [Wed, 19 Aug 2020 16:39:18 +0000 (17:39 +0100)]
Merge remote-tracking branch 'upstream/pull/2783'
Tom Hughes [Wed, 19 Aug 2020 16:31:56 +0000 (17:31 +0100)]
Merge remote-tracking branch 'upstream/pull/2782'
Tom Hughes [Wed, 19 Aug 2020 16:30:36 +0000 (17:30 +0100)]
Merge remote-tracking branch 'upstream/pull/2781'
Andy Allan [Wed, 19 Aug 2020 10:30:06 +0000 (12:30 +0200)]
Refactor client application pages to use bootstrap forms
Also rework the client application show page to be responsive
Andy Allan [Wed, 19 Aug 2020 08:45:57 +0000 (10:45 +0200)]
Avoid showing table header when there are no results
Andy Allan [Wed, 19 Aug 2020 08:45:27 +0000 (10:45 +0200)]
Rework issue search form to use Bootstrap form layout
Andy Allan [Wed, 12 Aug 2020 14:55:34 +0000 (16:55 +0200)]
Refactor reports form to use bootstrap
Andy Allan [Wed, 19 Aug 2020 14:43:16 +0000 (16:43 +0200)]
Avoid lego translations for coordinates
Use the i18n system for joining coordinate values together, while
avoiding making any changes or standardisation involving the exact
symbol used in each situation.
Refs #2732
Andy Allan [Wed, 19 Aug 2020 12:53:07 +0000 (14:53 +0200)]
Fix remaining unstyled buttons by moving to bootstrap buttons
Andy Allan [Wed, 19 Aug 2020 12:52:44 +0000 (14:52 +0200)]
Wrap the welcome buttons in a standard-form CSS class
translatewiki.net [Mon, 17 Aug 2020 17:25:42 +0000 (19:25 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 17 Aug 2020 13:11:01 +0000 (14:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2779'
Tom Hughes [Mon, 17 Aug 2020 13:10:59 +0000 (14:10 +0100)]
Merge remote-tracking branch 'upstream/pull/2778'
Simon Poole [Mon, 17 Aug 2020 12:08:37 +0000 (14:08 +0200)]
Block Canton Glarus imagery too
dependabot[bot] [Mon, 17 Aug 2020 05:01:26 +0000 (05:01 +0000)]
Bump eslint from 7.6.0 to 7.7.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.6.0 to 7.7.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.6.0...v7.7.0)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Sun, 16 Aug 2020 10:12:54 +0000 (11:12 +0100)]
Merge remote-tracking branch 'upstream/pull/2777'
Tom Hughes [Sun, 16 Aug 2020 10:12:51 +0000 (11:12 +0100)]
Merge remote-tracking branch 'upstream/pull/2776'
Simon Poole [Sun, 16 Aug 2020 09:20:09 +0000 (11:20 +0200)]
Black list 2010 and 2016 imagery for the Canton Schaffhauen
Sarah Hoffmann [Sat, 15 Aug 2020 15:38:02 +0000 (17:38 +0200)]
Update Nominatim description terms
Tom Hughes [Fri, 14 Aug 2020 08:28:39 +0000 (09:28 +0100)]
Merge remote-tracking branch 'upstream/pull/2773'
dependabot[bot] [Fri, 14 Aug 2020 05:01:23 +0000 (05:01 +0000)]
Bump ffi-libarchive from 1.0.3 to 1.0.4
Bumps [ffi-libarchive](https://github.com/chef/ffi-libarchive) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/chef/ffi-libarchive/releases)
- [Changelog](https://github.com/chef/ffi-libarchive/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chef/ffi-libarchive/compare/v1.0.3...v1.0.4)
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 13 Aug 2020 17:23:19 +0000 (19:23 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 12 Aug 2020 07:20:29 +0000 (08:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2770'
Tom Hughes [Wed, 12 Aug 2020 07:20:24 +0000 (08:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2769'
Tom Hughes [Wed, 12 Aug 2020 07:20:20 +0000 (08:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2768'
dependabot[bot] [Wed, 12 Aug 2020 05:01:46 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.77.0 to 1.78.0
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.77.0 to 1.78.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Wed, 12 Aug 2020 05:01:30 +0000 (05:01 +0000)]
Bump bootsnap from 1.4.7 to 1.4.8
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.7 to 1.4.8.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.7...v1.4.8)
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Wed, 12 Aug 2020 05:01:08 +0000 (05:01 +0000)]
Bump aasm from 5.1.0 to 5.1.1
Bumps [aasm](https://github.com/aasm/aasm) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/aasm/aasm/releases)
- [Changelog](https://github.com/aasm/aasm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aasm/aasm/compare/v5.1.0...v5.1.1)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Tue, 11 Aug 2020 17:23:05 +0000 (18:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2767'
Tom Hughes [Tue, 11 Aug 2020 17:23:01 +0000 (18:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2766'
dependabot[bot] [Tue, 11 Aug 2020 05:01:18 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.76.0 to 1.77.0
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.76.0 to 1.77.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Tue, 11 Aug 2020 05:00:59 +0000 (05:00 +0000)]
Bump rubocop from 0.89.0 to 0.89.1
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.89.0 to 0.89.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.89.0...v0.89.1)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Mon, 10 Aug 2020 17:20:23 +0000 (18:20 +0100)]
Fix marker paths for embedded map
Fixes #2763
Tom Hughes [Mon, 10 Aug 2020 17:11:09 +0000 (18:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2765'
Tom Hughes [Mon, 10 Aug 2020 17:11:06 +0000 (18:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2764'
dependabot[bot] [Mon, 10 Aug 2020 05:01:31 +0000 (05:01 +0000)]
Bump bootstrap from 4.5.0 to 4.5.2
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.5.0 to 4.5.2.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases)
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.5.0...v4.5.2)
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Mon, 10 Aug 2020 05:01:03 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.75.0 to 1.76.0
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.75.0 to 1.76.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Sun, 9 Aug 2020 18:51:45 +0000 (19:51 +0100)]
Update rubocop todo
Tom Hughes [Sun, 9 Aug 2020 18:46:16 +0000 (19:46 +0100)]
Fix some Style/StringConcatenation warnings
Tom Hughes [Sun, 9 Aug 2020 17:45:01 +0000 (18:45 +0100)]
Fix Style/ExplicitBlockArgument warnings
Tom Hughes [Sun, 9 Aug 2020 17:32:13 +0000 (18:32 +0100)]
Fix Lint/MissingSuper warnings
Tom Hughes [Sat, 8 Aug 2020 23:37:23 +0000 (00:37 +0100)]
Add some extra iD resources to the manifest
Closes #2762
Tom Hughes [Sat, 8 Aug 2020 09:47:02 +0000 (10:47 +0100)]
Correct path for mapnik marker images
Fixes #2759
Tom Hughes [Fri, 7 Aug 2020 16:19:49 +0000 (17:19 +0100)]
Ignore emails from inactive users
Fixes #2758
Tom Hughes [Fri, 7 Aug 2020 08:09:07 +0000 (09:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2756'
Tom Hughes [Fri, 7 Aug 2020 08:08:56 +0000 (09:08 +0100)]
Merge remote-tracking branch 'upstream/pull/2757'
translatewiki.net [Fri, 7 Aug 2020 07:47:59 +0000 (09:47 +0200)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Fri, 7 Aug 2020 05:01:28 +0000 (05:01 +0000)]
Bump leaflet.locatecontrol from 0.71.1 to 0.72.0
Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.71.1 to 0.72.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.71.1...v0.72.0)
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Fri, 7 Aug 2020 05:01:19 +0000 (05:01 +0000)]
Bump ohauth from 0.2.2 to 1.0.0
Bumps [ohauth](https://github.com/osmlab/ohauth) from 0.2.2 to 1.0.0.
- [Release notes](https://github.com/osmlab/ohauth/releases)
- [Changelog](https://github.com/osmlab/ohauth/blob/master/CHANGELOG.md)
- [Commits](https://github.com/osmlab/ohauth/compare/v0.2.2...v1.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Thu, 6 Aug 2020 21:43:16 +0000 (22:43 +0100)]
Fix eslint warnings
Tom Hughes [Thu, 6 Aug 2020 20:56:18 +0000 (21:56 +0100)]
Fix some new rubocop warnings
Tom Hughes [Thu, 6 Aug 2020 20:46:35 +0000 (21:46 +0100)]
Update bundle
Tom Hughes [Thu, 6 Aug 2020 19:39:42 +0000 (20:39 +0100)]
Replace querystring parser with qs yarn module
Tom Hughes [Thu, 6 Aug 2020 18:27:58 +0000 (19:27 +0100)]
Move jquery.cookie to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 18:09:32 +0000 (19:09 +0100)]
Move ohauth to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 18:08:03 +0000 (19:08 +0100)]
Move leaflet.locatecontrol to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 18:04:57 +0000 (19:04 +0100)]
Move leaflet to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 18:00:50 +0000 (19:00 +0100)]
Move jquery.simulate to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 17:56:04 +0000 (18:56 +0100)]
Move html5shiv to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 17:36:59 +0000 (18:36 +0100)]
Fix new rubocop warnings
Tom Hughes [Thu, 6 Aug 2020 17:14:42 +0000 (18:14 +0100)]
Update erb-lint
Tom Hughes [Thu, 6 Aug 2020 17:14:16 +0000 (18:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2754'