]> git.openstreetmap.org Git - rails.git/log
rails.git
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 10 Sep 2020 16:46:11 +0000 (18:46 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2822'
Tom Hughes [Thu, 10 Sep 2020 07:15:30 +0000 (08:15 +0100)]
Merge remote-tracking branch 'upstream/pull/2822'

4 years agoBump rails from 6.0.3.2 to 6.0.3.3
dependabot[bot] [Thu, 10 Sep 2020 05:00:45 +0000 (05:00 +0000)]
Bump rails from 6.0.3.2 to 6.0.3.3

Bumps [rails](https://github.com/rails/rails) from 6.0.3.2 to 6.0.3.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v6.0.3.2...v6.0.3.3)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2821'
Tom Hughes [Wed, 9 Sep 2020 07:59:15 +0000 (08:59 +0100)]
Merge remote-tracking branch 'upstream/pull/2821'

4 years agoUpdate to iD v2.18.5
Quincy Morgan [Wed, 9 Sep 2020 01:00:52 +0000 (21:00 -0400)]
Update to iD v2.18.5

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 7 Sep 2020 14:49:57 +0000 (16:49 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoFix new rubocop warnings
Tom Hughes [Mon, 7 Sep 2020 06:11:22 +0000 (07:11 +0100)]
Fix new rubocop warnings

4 years agoMerge remote-tracking branch 'upstream/pull/2818'
Tom Hughes [Mon, 7 Sep 2020 06:09:19 +0000 (07:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2818'

4 years agoMerge remote-tracking branch 'upstream/pull/2817'
Tom Hughes [Mon, 7 Sep 2020 06:08:20 +0000 (07:08 +0100)]
Merge remote-tracking branch 'upstream/pull/2817'

4 years agoMerge remote-tracking branch 'upstream/pull/2816'
Tom Hughes [Mon, 7 Sep 2020 06:08:17 +0000 (07:08 +0100)]
Merge remote-tracking branch 'upstream/pull/2816'

4 years agoMerge remote-tracking branch 'upstream/pull/2815'
Tom Hughes [Mon, 7 Sep 2020 06:08:08 +0000 (07:08 +0100)]
Merge remote-tracking branch 'upstream/pull/2815'

4 years agoBump rubocop-performance from 1.7.1 to 1.8.0
dependabot[bot] [Mon, 7 Sep 2020 05:02:09 +0000 (05:02 +0000)]
Bump rubocop-performance from 1.7.1 to 1.8.0

Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.7.1 to 1.8.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-performance/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-performance/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-performance/compare/v1.7.1...v1.8.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump brakeman from 4.9.0 to 4.9.1
dependabot[bot] [Mon, 7 Sep 2020 05:01:54 +0000 (05:01 +0000)]
Bump brakeman from 4.9.0 to 4.9.1

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.9.0 to 4.9.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.9.0...v4.9.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump puma from 4.3.5 to 4.3.6
dependabot[bot] [Mon, 7 Sep 2020 05:01:30 +0000 (05:01 +0000)]
Bump puma from 4.3.5 to 4.3.6

Bumps [puma](https://github.com/puma/puma) from 4.3.5 to 4.3.6.
- [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/v4.3.5...v4.3.6)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump rubocop-rails from 2.7.1 to 2.8.0
dependabot[bot] [Mon, 7 Sep 2020 05:01:05 +0000 (05:01 +0000)]
Bump rubocop-rails from 2.7.1 to 2.8.0

Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.7.1...v2.8.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoAPI User details JSON format
mmd-osm [Sun, 6 Sep 2020 20:11:23 +0000 (22:11 +0200)]
API User details JSON format

4 years agoMerge remote-tracking branch 'upstream/pull/2810'
Tom Hughes [Fri, 4 Sep 2020 10:24:19 +0000 (11:24 +0100)]
Merge remote-tracking branch 'upstream/pull/2810'

4 years agoBump leaflet from 1.6.0 to 1.7.1
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>
4 years agoConvert oauth authorization form to use bootstrap
Tom Hughes [Thu, 3 Sep 2020 23:29:14 +0000 (00:29 +0100)]
Convert oauth authorization form to use bootstrap

4 years agoConvert password reset forms to use bootstrap
Tom Hughes [Thu, 3 Sep 2020 22:53:57 +0000 (23:53 +0100)]
Convert password reset forms to use bootstrap

4 years agoConvert logout form to use bootstrap
Tom Hughes [Thu, 3 Sep 2020 22:52:59 +0000 (23:52 +0100)]
Convert logout form to use bootstrap

4 years agoConvert user confirmation forms to use bootstrap
Tom Hughes [Thu, 3 Sep 2020 22:51:23 +0000 (23:51 +0100)]
Convert user confirmation forms to use bootstrap

4 years agoConvert make/remove friend forms to use bootstrap
Tom Hughes [Thu, 3 Sep 2020 22:49:32 +0000 (23:49 +0100)]
Convert make/remove friend forms to use bootstrap

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 3 Sep 2020 14:48:11 +0000 (16:48 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoFix rubocop Style/SoleNestedConditional warnings
Tom Hughes [Wed, 2 Sep 2020 17:54:55 +0000 (18:54 +0100)]
Fix rubocop Style/SoleNestedConditional warnings

4 years agoFix rubocop Style/CombinableLoops warnings
Tom Hughes [Wed, 2 Sep 2020 17:27:11 +0000 (18:27 +0100)]
Fix rubocop Style/CombinableLoops warnings

4 years agoMerge remote-tracking branch 'upstream/pull/2806'
Tom Hughes [Wed, 2 Sep 2020 06:19:03 +0000 (07:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2806'

4 years agoMerge remote-tracking branch 'upstream/pull/2805'
Tom Hughes [Wed, 2 Sep 2020 06:18:35 +0000 (07:18 +0100)]
Merge remote-tracking branch 'upstream/pull/2805'

4 years agoHandle new rubocop warnings
Tom Hughes [Wed, 2 Sep 2020 06:18:21 +0000 (07:18 +0100)]
Handle new rubocop warnings

4 years agoMerge remote-tracking branch 'upstream/pull/2804'
Tom Hughes [Wed, 2 Sep 2020 06:11:47 +0000 (07:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2804'

4 years agoBump eslint from 7.7.0 to 7.8.1
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>
4 years agoBump minitest from 5.14.1 to 5.14.2
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>
4 years agoBump rubocop from 0.89.1 to 0.90.0
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>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 31 Aug 2020 14:16:14 +0000 (16:16 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2802'
Tom Hughes [Mon, 31 Aug 2020 07:29:05 +0000 (08:29 +0100)]
Merge remote-tracking branch 'upstream/pull/2802'

4 years agoBump omniauth-facebook from 6.0.0 to 7.0.0
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>
4 years agoMerge remote-tracking branch 'upstream/pull/2797'
Tom Hughes [Fri, 28 Aug 2020 08:09:12 +0000 (09:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2797'

4 years agoMake embed.js depend on the settings
Tom Hughes [Fri, 28 Aug 2020 08:08:28 +0000 (09:08 +0100)]
Make embed.js depend on the settings

4 years agoBump aws-sdk-s3 from 1.79.0 to 1.79.1
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>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 27 Aug 2020 13:56:58 +0000 (15:56 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2794'
Tom Hughes [Wed, 26 Aug 2020 07:27:30 +0000 (08:27 +0100)]
Merge remote-tracking branch 'upstream/pull/2794'

4 years agoBump aws-sdk-s3 from 1.78.0 to 1.79.0
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>
4 years agoAttempt to modernise vagrant configuration
Tom Hughes [Tue, 25 Aug 2020 19:57:50 +0000 (20:57 +0100)]
Attempt to modernise vagrant configuration

4 years agoMerge remote-tracking branch 'upstream/pull/2792'
Tom Hughes [Tue, 25 Aug 2020 07:09:57 +0000 (08:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2792'

4 years agoBump autoprefixer-rails from 9.8.6.2 to 9.8.6.3
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>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 24 Aug 2020 13:31:01 +0000 (15:31 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoOnly show the "too many messages" error once
Tom Hughes [Sun, 23 Aug 2020 09:41:39 +0000 (10:41 +0100)]
Only show the "too many messages" error once

Fixes #2790

4 years agoMerge remote-tracking branch 'upstream/pull/2786'
Tom Hughes [Sat, 22 Aug 2020 15:15:21 +0000 (16:15 +0100)]
Merge remote-tracking branch 'upstream/pull/2786'

4 years agoExtend cleanup script to cleanup old OAuth tokens
Tom Hughes [Sat, 22 Aug 2020 15:14:37 +0000 (16:14 +0100)]
Extend cleanup script to cleanup old OAuth tokens

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 21 Aug 2020 15:28:58 +0000 (17:28 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoBump autoprefixer-rails from 9.8.6.1 to 9.8.6.2
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>
4 years agoMerge remote-tracking branch 'upstream/pull/2784'
Tom Hughes [Thu, 20 Aug 2020 18:08:09 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/2784'

4 years agoBump canonical-rails from 0.2.8 to 0.2.9
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>
4 years agoAllow CDN URL for the embed page to be configured
Tom Hughes [Wed, 19 Aug 2020 20:44:24 +0000 (21:44 +0100)]
Allow CDN URL for the embed page to be configured

4 years agoMerge remote-tracking branch 'upstream/pull/2783'
Tom Hughes [Wed, 19 Aug 2020 16:39:18 +0000 (17:39 +0100)]
Merge remote-tracking branch 'upstream/pull/2783'

4 years agoMerge remote-tracking branch 'upstream/pull/2782'
Tom Hughes [Wed, 19 Aug 2020 16:31:56 +0000 (17:31 +0100)]
Merge remote-tracking branch 'upstream/pull/2782'

4 years agoMerge remote-tracking branch 'upstream/pull/2781'
Tom Hughes [Wed, 19 Aug 2020 16:30:36 +0000 (17:30 +0100)]
Merge remote-tracking branch 'upstream/pull/2781'

4 years agoRefactor client application pages to use bootstrap forms
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

4 years agoAvoid showing table header when there are no results
Andy Allan [Wed, 19 Aug 2020 08:45:57 +0000 (10:45 +0200)]
Avoid showing table header when there are no results

4 years agoRework issue search form to use Bootstrap form layout
Andy Allan [Wed, 19 Aug 2020 08:45:27 +0000 (10:45 +0200)]
Rework issue search form to use Bootstrap form layout

4 years agoRefactor reports form to use bootstrap
Andy Allan [Wed, 12 Aug 2020 14:55:34 +0000 (16:55 +0200)]
Refactor reports form to use bootstrap

4 years agoAvoid lego translations for coordinates
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

4 years agoFix remaining unstyled buttons by moving to bootstrap buttons
Andy Allan [Wed, 19 Aug 2020 12:53:07 +0000 (14:53 +0200)]
Fix remaining unstyled buttons by moving to bootstrap buttons

4 years agoWrap the welcome buttons in a standard-form CSS class
Andy Allan [Wed, 19 Aug 2020 12:52:44 +0000 (14:52 +0200)]
Wrap the welcome buttons in a standard-form CSS class

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 Aug 2020 17:25:42 +0000 (19:25 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2779'
Tom Hughes [Mon, 17 Aug 2020 13:11:01 +0000 (14:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2779'

4 years agoMerge remote-tracking branch 'upstream/pull/2778'
Tom Hughes [Mon, 17 Aug 2020 13:10:59 +0000 (14:10 +0100)]
Merge remote-tracking branch 'upstream/pull/2778'

4 years agoBlock Canton Glarus imagery too
Simon Poole [Mon, 17 Aug 2020 12:08:37 +0000 (14:08 +0200)]
Block Canton Glarus imagery too

4 years agoBump eslint from 7.6.0 to 7.7.0
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>
4 years agoMerge remote-tracking branch 'upstream/pull/2777'
Tom Hughes [Sun, 16 Aug 2020 10:12:54 +0000 (11:12 +0100)]
Merge remote-tracking branch 'upstream/pull/2777'

4 years agoMerge remote-tracking branch 'upstream/pull/2776'
Tom Hughes [Sun, 16 Aug 2020 10:12:51 +0000 (11:12 +0100)]
Merge remote-tracking branch 'upstream/pull/2776'

4 years agoBlack list 2010 and 2016 imagery for the Canton Schaffhauen
Simon Poole [Sun, 16 Aug 2020 09:20:09 +0000 (11:20 +0200)]
Black list 2010 and 2016 imagery for the Canton Schaffhauen

4 years agoUpdate Nominatim description terms
Sarah Hoffmann [Sat, 15 Aug 2020 15:38:02 +0000 (17:38 +0200)]
Update Nominatim description terms

4 years agoMerge remote-tracking branch 'upstream/pull/2773'
Tom Hughes [Fri, 14 Aug 2020 08:28:39 +0000 (09:28 +0100)]
Merge remote-tracking branch 'upstream/pull/2773'

4 years agoBump ffi-libarchive from 1.0.3 to 1.0.4
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>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 13 Aug 2020 17:23:19 +0000 (19:23 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2770'
Tom Hughes [Wed, 12 Aug 2020 07:20:29 +0000 (08:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2770'

4 years agoMerge remote-tracking branch 'upstream/pull/2769'
Tom Hughes [Wed, 12 Aug 2020 07:20:24 +0000 (08:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2769'

4 years agoMerge remote-tracking branch 'upstream/pull/2768'
Tom Hughes [Wed, 12 Aug 2020 07:20:20 +0000 (08:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2768'

4 years agoBump aws-sdk-s3 from 1.77.0 to 1.78.0
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>
4 years agoBump bootsnap from 1.4.7 to 1.4.8
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>
4 years agoBump aasm from 5.1.0 to 5.1.1
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>
4 years agoMerge remote-tracking branch 'upstream/pull/2767'
Tom Hughes [Tue, 11 Aug 2020 17:23:05 +0000 (18:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2767'

4 years agoMerge remote-tracking branch 'upstream/pull/2766'
Tom Hughes [Tue, 11 Aug 2020 17:23:01 +0000 (18:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2766'

4 years agoBump aws-sdk-s3 from 1.76.0 to 1.77.0
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>
4 years agoBump rubocop from 0.89.0 to 0.89.1
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>
4 years agoFix marker paths for embedded map
Tom Hughes [Mon, 10 Aug 2020 17:20:23 +0000 (18:20 +0100)]
Fix marker paths for embedded map

Fixes #2763

4 years agoMerge remote-tracking branch 'upstream/pull/2765'
Tom Hughes [Mon, 10 Aug 2020 17:11:09 +0000 (18:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2765'

4 years agoMerge remote-tracking branch 'upstream/pull/2764'
Tom Hughes [Mon, 10 Aug 2020 17:11:06 +0000 (18:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2764'

4 years agoBump bootstrap from 4.5.0 to 4.5.2
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>
4 years agoBump aws-sdk-s3 from 1.75.0 to 1.76.0
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>
4 years agoUpdate rubocop todo
Tom Hughes [Sun, 9 Aug 2020 18:51:45 +0000 (19:51 +0100)]
Update rubocop todo

4 years agoFix some Style/StringConcatenation warnings
Tom Hughes [Sun, 9 Aug 2020 18:46:16 +0000 (19:46 +0100)]
Fix some Style/StringConcatenation warnings

4 years agoFix Style/ExplicitBlockArgument warnings
Tom Hughes [Sun, 9 Aug 2020 17:45:01 +0000 (18:45 +0100)]
Fix Style/ExplicitBlockArgument warnings

4 years agoFix Lint/MissingSuper warnings
Tom Hughes [Sun, 9 Aug 2020 17:32:13 +0000 (18:32 +0100)]
Fix Lint/MissingSuper warnings

4 years agoAdd some extra iD resources to the manifest
Tom Hughes [Sat, 8 Aug 2020 23:37:23 +0000 (00:37 +0100)]
Add some extra iD resources to the manifest

Closes #2762

4 years agoCorrect path for mapnik marker images
Tom Hughes [Sat, 8 Aug 2020 09:47:02 +0000 (10:47 +0100)]
Correct path for mapnik marker images

Fixes #2759

4 years agoIgnore emails from inactive users
Tom Hughes [Fri, 7 Aug 2020 16:19:49 +0000 (17:19 +0100)]
Ignore emails from inactive users

Fixes #2758

4 years agoMerge remote-tracking branch 'upstream/pull/2756'
Tom Hughes [Fri, 7 Aug 2020 08:09:07 +0000 (09:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2756'

4 years agoMerge remote-tracking branch 'upstream/pull/2757'
Tom Hughes [Fri, 7 Aug 2020 08:08:56 +0000 (09:08 +0100)]
Merge remote-tracking branch 'upstream/pull/2757'