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

Bump eslint from 7.14.0 to 7.15.0

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

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

Update bundle

Pin rubcop to 0.x to avoid erb_lint issues

Disable dependabot for ruby gems

Closes #2992

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

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

Localisation updates from https://translatewiki.net.

Avoid using raw in html mailer views

Use the _html suffix to mark that we expect the translations to contain links.

Unfortunately, we can't use the _html keys for the plain text emails, since the input options (e.g. username, url) will be html-escaped,
before it is passed to the view. So we need to use non-html-suffix keys for the plaintext views, in most cases. Only when the translation
options (e.g. url) are guaranteed to not contain any escapable characters can the same translation key be shared.

Add a test for i18n interpolation into plain and html parts

I spent some time working on an alternative translation strategy, without realising some of the plain text implications.

Merge pull request #2969 from tuckerrc/diary-updated-date

Add last updated date to diary entry page

Bump aws-sdk-s3 from 1.85.0 to 1.86.0

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

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

Improve guessing of labels for Nominatim results

This adapts to two changes in place handling by Nominatim:

* Place links that are computed by Nominatim are now found in
  extratags['linked_places']. Keep the check for extratags['place']
  as this may contain an explicitly mapped place label.
* Use address rank for guessing the admin level. This gets normalised
  by Nominatim with respect to country-specific use of admin_level.

Also adds additional labels for admin levels, so that we now have
complete coverage for all levels that are in use in OSM.

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

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

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

Bump puma from 5.0.4 to 5.1.0

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

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

Localisation updates from https://translatewiki.net.

Bump listen from 3.3.1 to 3.3.3

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

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

Bump rubocop-performance from 1.9.0 to 1.9.1

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

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

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

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

Bump autoprefixer-rails from 10.0.2.0 to 10.0.3.0

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

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

Bump capybara from 3.33.0 to 3.34.0

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.33.0 to 3.34.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.33.0...3.34.0)

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

Update translate string and only show if different from creation time

Localisation updates from https://translatewiki.net.

Avoid calling raw in plain text email templates

Rails doesn't escape text in text/plain outputs, since before Rails 4.

See https://github.com/rails/rails/pull/8235

Remove duplicate translation strings, and use short form translation lookups

Rename subject translation key, for consistency

Use rails t helper to allow relative translation keys in email subjects

This makes it easier to rename methods and translation keys.

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.

Add last updated date to diary entry page

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>

Add updated authentication logos

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

Preload traces for the selected points

It doesn't make a huge difference, since rails caches all the results
of the queries generated by point.trace lookups, but at least it cuts
down on the logs.

Use point.trace instead of an additional gpx_file variable

Every point knows which trace it's associated with, so there's no
need to search for it separately

Remove unused code

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>