Prefer string interpolation to concatenation

Merge remote-tracking branch 'upstream/pull/2919' into master

Avoid some uses of html_safe

We can use `html_safe` on non-interpolated strings, since that's trusted content.

Merge remote-tracking branch 'upstream/pull/2918' into master

Ensure that test utility methods are marked as private

This allows us to enable the check for test method names.

Refactor test to use general basic_authorization_header method

There's no need for this test to have its own version of the method.

Merge remote-tracking branch 'upstream/pull/2917' into master

Resolve some extra-long lines

Merge remote-tracking branch 'upstream/pull/2916' into master

Merge remote-tracking branch 'upstream/pull/2915' into master

Bump puma from 5.0.3 to 5.0.4

Bumps [puma](https://github.com/puma/puma) from 5.0.3 to 5.0.4.
- [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/v5.0.3...v5.0.4)

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

Update to iD v2.19.1

Merge remote-tracking branch 'upstream/pull/2914' into master

Update to iD v2.19.0

Merge remote-tracking branch 'upstream/pull/2912' into master

Merge remote-tracking branch 'upstream/pull/2911' into master

Merge remote-tracking branch 'upstream/pull/2910' into master

Bump bootsnap from 1.4.8 to 1.4.9

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.8 to 1.4.9.
- [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.8...v1.4.9)

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

Bump eslint from 7.12.0 to 7.12.1

Bumps [eslint](https://github.com/eslint/eslint) from 7.12.0 to 7.12.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.12.0...v7.12.1)

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

Bump puma from 5.0.2 to 5.0.3

Bumps [puma](https://github.com/puma/puma) from 5.0.2 to 5.0.3.
- [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/v5.0.2...v5.0.3)

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

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/2907' into master

Merge remote-tracking branch 'upstream/pull/2906' into master

Bump strong_migrations from 0.7.1 to 0.7.2

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.1 to 0.7.2.
- [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.1...v0.7.2)

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

Bump eslint from 7.11.0 to 7.12.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.11.0 to 7.12.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.11.0...v7.12.0)

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

Localisation updates from https://translatewiki.net.

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

Fix close handler for welcome message

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

Merge pull request #2902 from seav/patch-1

Link to official OWG Banner Policy page

Link to official OWG Banner Policy page

- Link to the official Banner Policy page on the OWG website instead of a GitHub ticket discussion
- Reformat Markdown lists so that the rendered HTML results in properly nested lists

Use flexbox to position the close icon on the sidebars

This ensures that the text and the close icon don't overlap, regardless
of the length of the title. The title div grows to use all available
space, while ensuring the text breaks if necessary to prevent it from
pushing the close icon offscreen.

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

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

Avoid various uses of html_safe

We can avoid using `html_safe` in various circumstances, through alternative approaches like i18n keys ending in `_html` or using `safe_join` to avoid converting via unsafe string types.

The `_html` keys approach only work for ActionView helper version of `t`, not the base `I18n.t` method.

Remove unused translation

The code that used this was removed in 9a9e13af901e9d66357135fb39b111fc9e26b3b2

Remove unused translations

The code that used these translations was removed in aaeca5b5346b01d7ef26a301492804d36049eff8

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

Fix call to UserMailer in message delivery

Fixes #2895

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

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

Bump aws-sdk-s3 from 1.83.0 to 1.83.1

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.83.0 to 1.83.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>

Bump omniauth-facebook from 7.0.0 to 8.0.0

Bumps [omniauth-facebook](https://github.com/simi/omniauth-facebook) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/simi/omniauth-facebook/releases)
- [Changelog](https://github.com/simi/omniauth-facebook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/simi/omniauth-facebook/compare/v7.0.0...v8.0.0)

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

Update test results for presence of zh-HK translations

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

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

Localisation updates from https://translatewiki.net.

Bump webmock from 3.9.2 to 3.9.3

Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.2 to 3.9.3.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.2...v3.9.3)

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

Bump faraday from 1.0.1 to 1.1.0

Bumps [faraday](https://github.com/lostisland/faraday) from 1.0.1 to 1.1.0.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v1.0.1...v1.1.0)

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

Also fix private road

Update icon for destination access in map key

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

Bump activerecord-import from 1.0.6 to 1.0.7

Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.6 to 1.0.7.
- [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.6...v1.0.7)

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

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

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

Bump i18n-js from 3.7.1 to 3.8.0

Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.7.1 to 3.8.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.1...v3.8.0)

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

Rename Notifier to UserMailer

It's a convention in rails to name your mailers with a Mailer suffix, and is also common to name the class after the recipient (e.g. User, Admin). So UserMailer seems a reasonable choice.

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

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

Bump rubocop from 0.93.0 to 0.93.1

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.93.0 to 0.93.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.93.0...v0.93.1)

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

Bump webmock from 3.9.1 to 3.9.2

Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.1...v3.9.2)

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

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

Localisation updates from https://translatewiki.net.

Bump eslint from 7.10.0 to 7.11.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.10.0 to 7.11.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.10.0...v7.11.0)

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

Fix new rubocop warnings

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

Bump rubocop from 0.92.0 to 0.93.0

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.92.0 to 0.93.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.92.0...v0.93.0)

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

Localisation updates from https://translatewiki.net.

Revert accidental changes to database structure

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

Bump rails from 6.0.3.3 to 6.0.3.4

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

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

Index changeset comments by changeset and date

Index changeset comments by author and date

Localisation updates from https://translatewiki.net.

Update bundle

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

Localisation updates from https://translatewiki.net.

Bump better_errors from 2.8.1 to 2.8.2

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.8.1 to 2.8.2.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/commits)

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

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

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

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

Bump rotp from 6.1.0 to 6.2.0

Bumps [rotp](https://github.com/mdp/rotp) from 6.1.0 to 6.2.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/commits)

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

Bump aws-sdk-s3 from 1.81.1 to 1.82.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.81.1 to 1.82.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>

Use the db:seed task to load languages

This is seed data that should reasonably be loaded into every database,
even those that are otherwise empty (e.g. no geo data). Using the seeds
process means that it will usually be loaded by default, and is easier
to find for existing rails developers.

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

Remove unused locale scripts

We no longer need these scripts, given our current translatewiki workflows

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

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

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

Bump autoprefixer-rails from 10.0.0.2 to 10.0.1.0

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

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

Invalidate existing sessions when changing email or password

As we don't have any way to actually find the active sessions for
an account we instead store a fingerprint in the session, and refuse
to use any session with a different fingerprint.

Delete any outstanding tokens when a user changes their email

This ensures that any tokens previously sent to the old email address
can no longer be used if somebody were able to access that address.

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

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

Bump puma from 4.3.6 to 5.0.2

Bumps [puma](https://github.com/puma/puma) from 4.3.6 to 5.0.2.
- [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.6...v5.0.2)

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

Bump brakeman from 4.9.1 to 4.10.0

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.9.1 to 4.10.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.9.1...v4.10.0)

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

Localisation updates from https://translatewiki.net.

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

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

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