Merge remote-tracking branch 'upstream/pull/2806'

Merge remote-tracking branch 'upstream/pull/2805'

Handle new rubocop warnings

Merge remote-tracking branch 'upstream/pull/2804'

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>

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>

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>

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/2802'

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>

Merge remote-tracking branch 'upstream/pull/2797'

Make embed.js depend on the settings

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>

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/2794'

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>

Attempt to modernise vagrant configuration

Merge remote-tracking branch 'upstream/pull/2792'

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>

Localisation updates from https://translatewiki.net.

Only show the "too many messages" error once

Fixes #2790

Merge remote-tracking branch 'upstream/pull/2786'

Extend cleanup script to cleanup old OAuth tokens

Localisation updates from https://translatewiki.net.

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>

Merge remote-tracking branch 'upstream/pull/2784'

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>

Allow CDN URL for the embed page to be configured

Merge remote-tracking branch 'upstream/pull/2783'

Merge remote-tracking branch 'upstream/pull/2782'

Merge remote-tracking branch 'upstream/pull/2781'

Refactor client application pages to use bootstrap forms

Also rework the client application show page to be responsive

Avoid showing table header when there are no results

Rework issue search form to use Bootstrap form layout

Refactor reports form to use bootstrap

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

Fix remaining unstyled buttons by moving to bootstrap buttons

Wrap the welcome buttons in a standard-form CSS class

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/2779'

Merge remote-tracking branch 'upstream/pull/2778'

Block Canton Glarus imagery too

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>

Merge remote-tracking branch 'upstream/pull/2777'

Merge remote-tracking branch 'upstream/pull/2776'

Black list 2010 and 2016 imagery for the Canton Schaffhauen

Update Nominatim description terms

Merge remote-tracking branch 'upstream/pull/2773'

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>

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/2770'

Merge remote-tracking branch 'upstream/pull/2769'

Merge remote-tracking branch 'upstream/pull/2768'

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>

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>

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>

Merge remote-tracking branch 'upstream/pull/2767'

Merge remote-tracking branch 'upstream/pull/2766'

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>

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>

Fix marker paths for embedded map

Fixes #2763

Merge remote-tracking branch 'upstream/pull/2765'

Merge remote-tracking branch 'upstream/pull/2764'

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>

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>

Update rubocop todo

Fix some Style/StringConcatenation warnings

Fix Style/ExplicitBlockArgument warnings

Fix Lint/MissingSuper warnings

Add some extra iD resources to the manifest

Closes #2762

Correct path for mapnik marker images

Fixes #2759

Ignore emails from inactive users

Fixes #2758

Merge remote-tracking branch 'upstream/pull/2756'

Merge remote-tracking branch 'upstream/pull/2757'

Localisation updates from https://translatewiki.net.

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>

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>

Fix eslint warnings

Fix some new rubocop warnings

Update bundle

Replace querystring parser with qs yarn module

Move jquery.cookie to be a yarn managed asset

Move ohauth to be a yarn managed asset

Move leaflet.locatecontrol to be a yarn managed asset

Move leaflet to be a yarn managed asset

Move jquery.simulate to be a yarn managed asset

Move html5shiv to be a yarn managed asset

Fix new rubocop warnings

Update erb-lint

Merge remote-tracking branch 'upstream/pull/2754'

Don't fall back to name:en if it's not in the user's language list

Fix to #2755

Bump rubocop from 0.86.0 to 0.89.0

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.86.0 to 0.89.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.86.0...v0.89.0)

Signed-off-by: dependabot[bot] <support@github.com>

Merge remote-tracking branch 'upstream/pull/2667'

Merge remote-tracking branch 'upstream/pull/2753'

Merge remote-tracking branch 'upstream/pull/2752'

Bump brakeman from 4.8.2 to 4.9.0

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.8.2 to 4.9.0.
- [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.8.2...v4.9.0)

Signed-off-by: dependabot[bot] <support@github.com>

Merge remote-tracking branch 'upstream/pull/2751'

Bump rotp from 6.0.0 to 6.1.0

Bumps [rotp](https://github.com/mdp/rotp) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/mdp/rotp/releases)
- [Changelog](https://github.com/mdp/rotp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mdp/rotp/compare/v6.0.0...v6.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/2750'