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

Allow smtp settings to be configured through the settings system

This allows easier configuration using the settings.local.yml files

Fixes #2571

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

Merge pull request #2971 from tomhughes/table

Add bootstrap classes to markdown tables

Fix trace tag interpolation, and add a test

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

Bump strong_migrations from 0.7.2 to 0.7.3

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

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

Localisation updates from https://translatewiki.net.

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

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

Bump eslint from 7.13.0 to 7.14.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.13.0 to 7.14.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.13.0...v7.14.0)

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

Bump aws-sdk-s3 from 1.84.1 to 1.85.0

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

Localisation updates from https://translatewiki.net.

Add bootstrap classes to markdown tables

Refactor trace notifications to reduce lego translations

Fixes #2268.

Unfortunately there's still a lego translation when both halves of the sentence are joined together, but this at least reduces the number of combinations to translate.

Fix erblint warning

Fix new rubocop warnings

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

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

Bump rubocop-performance from 1.8.1 to 1.9.0

Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.8.1 to 1.9.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.8.1...v1.9.0)

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

Localisation updates from https://translatewiki.net.

Bump listen from 3.3.0 to 3.3.1

Bumps [listen](https://github.com/guard/listen) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.3.0...v3.3.1)

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

Fix HTML escaping issues with user role icons

Prefer string interpolation to concatenation

Improve readability

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

Prefer keyword arguments when method has optional boolean arguments

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

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

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

Bump webmock from 3.9.5 to 3.10.0

Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.5 to 3.10.0.
- [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.5...v3.10.0)

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

Bump composite_primary_keys from 12.0.2 to 12.0.3

Bumps [composite_primary_keys](https://github.com/drnic/composite_primary_keys) from 12.0.2 to 12.0.3.
- [Release notes](https://github.com/drnic/composite_primary_keys/releases)
- [Changelog](https://github.com/composite-primary-keys/composite_primary_keys/blob/master/History.rdoc)
- [Commits](https://github.com/drnic/composite_primary_keys/compare/12.0.2...12.0.3)

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

Prefer keyword arguments when method has optional boolean arguments

Prefer keyword arguments when method has optional boolean arguments

Prefer string interpolation to concatenation in erb files

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

Fix missing html layout for user_mailer emails

This was caused by renaming the mailer without renaming the layout. Added a test to cover this in future.

Fixes #2903

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

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

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

Bump autoprefixer-rails from 10.0.1.3 to 10.0.2.0

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

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

Bump bootsnap from 1.5.0 to 1.5.1

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.5.0 to 1.5.1.
- [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.5.0...v1.5.1)

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

Bump aws-sdk-s3 from 1.84.0 to 1.84.1

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

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

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

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

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

Add yarn to Ubuntu install instructions

Bump webmock from 3.9.4 to 3.9.5

Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.4 to 3.9.5.
- [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.4...v3.9.5)

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

Bump aws-sdk-s3 from 1.83.2 to 1.84.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.83.2 to 1.84.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 listen from 3.2.1 to 3.3.0

Bumps [listen](https://github.com/guard/listen) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.2.1...v3.3.0)

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

Update to iD v2.19.5

Localisation updates from https://translatewiki.net.

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

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

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

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

Bump mini_magick from 4.10.1 to 4.11.0

Bumps [mini_magick](https://github.com/minimagick/minimagick) from 4.10.1 to 4.11.0.
- [Release notes](https://github.com/minimagick/minimagick/releases)
- [Commits](https://github.com/minimagick/minimagick/compare/v4.10.1...v4.11.0)

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

Bump eslint from 7.12.1 to 7.13.0

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

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

Bump aws-sdk-s3 from 1.83.1 to 1.83.2

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.83.1 to 1.83.2.
- [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 bootstrap from 4.5.2 to 4.5.3

Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.5.2 to 4.5.3.
- [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.2...v4.5.3)

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

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

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

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

Bump webmock from 3.9.3 to 3.9.4

Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.3 to 3.9.4.
- [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.3...v3.9.4)

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

Bump better_errors from 2.9.0 to 2.9.1

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.9.0...v2.9.1)

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

Bump libxml-ruby from 3.2.0 to 3.2.1

Bumps [libxml-ruby](https://github.com/xml4r/libxml-ruby) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/xml4r/libxml-ruby/releases)
- [Changelog](https://github.com/xml4r/libxml-ruby/blob/master/HISTORY)
- [Commits](https://github.com/xml4r/libxml-ruby/compare/v3.2.0...v3.2.1)

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

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

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

Localisation updates from https://translatewiki.net.

Bump autoprefixer-rails from 10.0.1.2 to 10.0.1.3

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

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

Bump better_errors from 2.8.3 to 2.9.0

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.8.3 to 2.9.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.3...v2.9.0)

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

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

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

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

Bump bootsnap from 1.4.9 to 1.5.0

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

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

Bump autoprefixer-rails from 10.0.1.1 to 10.0.1.2

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

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

Update to iD v2.19.4

Localisation updates from https://translatewiki.net.

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

Bump autoprefixer-rails from 10.0.1.0 to 10.0.1.1

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

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

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

Allow redirects to authentication services from the settings page

Chrome and Safari require redirects to match the form-action rule
as well as the original submission address.

Update to iD v2.19.3

Localisation updates from https://translatewiki.net.

Changed Ubuntu 18.04 to 20.04 and Ruby 2.5 to 2.7

Fixes #2909
Closes #2922

Prefer string interpolation to concatenation

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

Update to iD v2.19.2

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