Black list 2010 and 2016 imagery for the Canton Schaffhauen

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'

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

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

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

Bump autoprefixer-rails from 9.8.6 to 9.8.6.1

Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 9.8.6 to 9.8.6.1.
- [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...9.8.6.1)

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

Bump activerecord-import from 1.0.5 to 1.0.6

Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.5 to 1.0.6.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.5...v1.0.6)

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

Bump eslint from 7.5.0 to 7.6.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.5.0 to 7.6.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.5.0...v7.6.0)

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

Bump aasm from 5.0.8 to 5.1.0

Bumps [aasm](https://github.com/aasm/aasm) from 5.0.8 to 5.1.0.
- [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.0.8...v5.1.0)

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

Added banner for OpenStreetMap 16th birthday

Fix some rubocop todos

Register warning and error flash types

Fixes #2743

Fix rubocop warning

Switch to bundler 2.x

Target ruby 2.7 for rubocop checks

Run tests on ruby 2.7.0 to match production systems

Restore erblint workaround

Fix some rubocop todos

Update rubocop todo

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

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

Fix the Command Injection warnings from Brakeman

Update to iD v2.18.4

Bump autoprefixer-rails from 9.8.5 to 9.8.6

Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 9.8.5 to 9.8.6.
- [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.5...9.8.6)

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

Localisation updates from https://translatewiki.net.

Merge pull request #2737 from openstreetmap/dependabot/bundler/strong_migrations-0.7.1

Bump strong_migrations from 0.7.0 to 0.7.1

Bump strong_migrations from 0.7.0 to 0.7.1

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.0...v0.7.1)

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

Localisation updates from https://translatewiki.net.

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

turn_costs=true only for car

I know there was a bit forth and back in #2695 and my last recommendation was to use turn_costs=true. This was not intended for bike and foot.

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

Merge pull request #2730 from openstreetmap/dependabot/bundler/bootsnap-1.4.7

Bump bootsnap from 1.4.6 to 1.4.7

Merge pull request #2729 from Firefishy/remove-legacy-openlayers

Remove legacy OpenLayers files

Bump strong_migrations from 0.6.8 to 0.7.0

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.6.8 to 0.7.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.6.8...v0.7.0)

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

Bump bootsnap from 1.4.6 to 1.4.7

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.6 to 1.4.7.
- [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.6...v1.4.7)

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

Remove legacy OpenLayers

Remove legacy OpenLayers code, which for www.openstreetmap.org is
now managed by https://github.com/openstreetmap/chef/tree/master/cookbooks/web/files/default/static/openlayers

Fix the CrossSiteScripting warnings from Brakeman

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

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

Fix the Redirect warnings from Brakeman

Unfortunately I've had to leave the check disabed as Brakeman
can't see inside the safe_referer method so doesn't realise that
it is cleaning the referer.

Use the worldCopyJump option for leaflet overlays

This means that if you pan to a 'copy' of the world, the overlays
reappear on that copy.

Fixes #2040

Add some changsets that shouldn't be selected

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

Update to iD v2.18.3

Refactor changeset index testing to assert against objects, not db queries

This avoids the situation where tests pass despite an empty db.

Refs #2614

Refator way_full test to avoid relying on non-existant fixtures

Refs #2614

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

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