Fix the email address that's suggested for whitelisting

Refs #3215

Update bundle

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

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

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

Set updated_by when resolving issues

Refs #3211

Merge pull request #3208 from osm-hr/update-rcn-color

fix map key color for regional OpenCycleMap

Fix case when user block durations are slightly negative

The output from ActiveSupport::Duration is wildly unhelpful in those cases

Fixes #3210

Ensure that short duration blockss are shown as '0 hours'

Passing `:count => nil` means that i18n.t will return the hash of translations, so use a default value of 0 when checking for hours to prevent this.

Refs #3210

Drop last vestiges of ruby 2.5 support

Update bundle

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

Localisation updates from https://translatewiki.net.

Bump eslint from 7.27.0 to 7.28.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.27.0 to 7.28.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.27.0...v7.28.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

Fix erblint warnings

Set a referrer policy

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

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

Added missing dependency for fedora install

fixed nodejs package name for fedora

Localisation updates from https://translatewiki.net.

Fix new rubocop warnings

Update bundle

Localisation updates from https://translatewiki.net.

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

Bump actions/cache from 2.1.5 to 2.1.6

Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6)

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

Localisation updates from https://translatewiki.net.

fix map key color for regional OpenCycleMap, as it changed from light cyan to purple on the map.
Closes: https://github.com/openstreetmap/openstreetmap-website/issues/2785

Update bundle

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

Bump ohauth from 1.0.0 to 1.0.1

Bumps [ohauth](https://github.com/osmlab/ohauth) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/osmlab/ohauth/releases)
- [Changelog](https://github.com/osmlab/ohauth/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/ohauth/compare/v1.0.0...v1.0.1)

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

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

Localisation updates from https://translatewiki.net.

Bump eslint from 7.26.0 to 7.27.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.26.0 to 7.27.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.26.0...v7.27.0)

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

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

Fix downloading of image variants

Switch to using 'rails test:all' in documentation and CI

Fixes #3116.

This allows us to drop our custom patch for running system tests,
as well as opening up all the usual rails test goodies like running
individual files or directories.

Update bundle

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

Bump puma from 5.3.0 to 5.3.1

Bumps [puma](https://github.com/puma/puma) from 5.3.0 to 5.3.1.
- [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.3.0...v5.3.1)

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

Enable variant tracking for Active Storage

Fix eslint warnings

Enable some more rails 6.1 defaults

Mark javascript issued cookies with SameSite=Lax

Switch to using js-cookie to manage cookies from javascript

Default rails generated cookies to SameSite=Lax

Localisation updates from https://translatewiki.net.

Switch to new defaults for queue names

Enable new Active Job defaults

Enable link header for asset preloading

Enable new connection handling API

Enable use of URL safe CSRF tokens

Fix rubocop Rake/MethodDefinitionInTask warnings

Add ruby 3.0 to test matrix

Localisation updates from https://translatewiki.net.

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

Use image_processing macros to resize images

Fix deprecation warnings

Update to rails 6.1.3.2

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

Add rubocop-rake

This checks the coding standards in our rake files.

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

Bump actions/setup-ruby from 1 to 1.1.3

Bumps [actions/setup-ruby](https://github.com/actions/setup-ruby) from 1 to 1.1.3.
- [Release notes](https://github.com/actions/setup-ruby/releases)
- [Commits](https://github.com/actions/setup-ruby/compare/v1...v1.1.3)

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

Fix calculation of friendship rate limit

Add rate limiting to user friendships

Drop monkey patch that is no longer needed with rails 6

Drop monkey patch that is no longer required

Localisation updates from https://translatewiki.net.

Update bundle

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

Bump eslint from 7.25.0 to 7.26.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.25.0 to 7.26.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.25.0...v7.26.0)

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

Localisation updates from https://translatewiki.net.

Update to rails 6.0.3.7

Update bundle

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

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

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

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

Refactor user blocks information to use a dl

This also standardises the labels to have the colon, in common with
oauth_clients#show.

Merge branch 'pull/3146'

Move duration to its own line, so that it can be clearly labelled

Use the rake extension for remaining files, for consistency

Merge pull request #3104 from fredrik-lindseth/patch-1

Format openstreetmap.org/stats/data_stats

Merge pull request #3169 from harry-wood/empty-lists

Display message when the there are no notes/comments to display

Update bundle

Monkey patch oauth gem to avoid use of deprecated URI.unescape

Handle UTF-8 correctly in monkey patched OAuth::Helper.escape

Fixes #3185

Localisation updates from https://translatewiki.net.

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

Bump eslint from 7.24.0 to 7.25.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.24.0 to 7.25.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.24.0...v7.25.0)

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

Fix some ruby 3 compatibility issues

Update deadlock_retry gem for ruby 3 compatibility

Monkey patch oauth gem to avoid use of deprecated URI.escape

Drop dynamic_form gem which is no longer required

Drop version constraint for debug_inspector

Localisation updates from https://translatewiki.net.

Fix new rubocop warnings

Update bundle