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

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

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

Remove unnecessary layout calls from api controllers

These were left over from the refactoring of the controllers into api and non-api versions.

Rename the notes#mine action to index

Rework the users#show page to avoid custom column css

This uses bootstrap instead, ensuring the map shows before the
text on small screens, but to the right of it on md+ widths. The
height of the map also changes at this breakpoint instead of being
based on the menu width (body.small).

The account edit page was also changed to match the content_map
changes, and a full width map is now used. This can be changed, if
required, using bootstrap breakpoints but I like it as it is.

Fix new rubocop warnings

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

Only report traces as offline when they are offline

Remove some debug logging comitted by mistake

Bump rubocop-performance from 1.6.1 to 1.7.0

Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.6.1 to 1.7.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.6.1...v1.7.0)

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

Localisation updates from https://translatewiki.net.

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

Bump eslint from 7.3.1 to 7.4.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.3.1 to 7.4.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.3.1...v7.4.0)

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

Fix errors with GPX offline mode

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

Rephrase the 'used_by' text on the about page.

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

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

Make the back button not look disabled

This switches the message buttons to use bootstrap, so that we can have a back button that looks clickable.

Alternative implementation of #2386

Avoid list markers for the richtext help text

Merge pull request #2674 from openstreetmap/dependabot/bundler/bootstrap-4.5.0

Bump bootstrap from 4.3.1 to 4.5.0

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

Bump aws-sdk-s3 from 1.72.0 to 1.73.0

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

Bump bootstrap from 4.3.1 to 4.5.0

Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.3.1 to 4.5.0.
- [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.3.1...v4.5.0)

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

Add banner for SOTM 2020

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

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

Bump json from 2.3.0 to 2.3.1

Bumps [json](https://github.com/flori/json) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/flori/json/releases)
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md)
- [Commits](https://github.com/flori/json/compare/v2.3.0...v2.3.1)

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

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

Bump i18n-js from 3.7.0 to 3.7.1

Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.7.0 to 3.7.1.
- [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.0...v3.7.1)

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

Merge pull request #2681 from rahulvaish/patch-1

Updated README.md

Updated README.md

Introduced Full Stops to maintain the consistency in the document.

Localisation updates from https://translatewiki.net.

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

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

Bump rails-i18n from 4.0.2 to 6.0.0

Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 4.0.2 to 6.0.0.
- [Release notes](https://github.com/svenfuchs/rails-i18n/releases)
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/commits/v6.0.0)

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

Bump aws-sdk-s3 from 1.71.1 to 1.72.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.71.1 to 1.72.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 kramdown from 2.2.1 to 2.3.0

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

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

Revert "Bump rails-i18n from 4.0.2 to 6.0.0"

This reverts commit a6d8043dc25d213f9c6ee397f586ffd97a90c164.

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

Enable locale fallback in all environments

Bump rails-i18n from 4.0.2 to 6.0.0

Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 4.0.2 to 6.0.0.
- [Release notes](https://github.com/svenfuchs/rails-i18n/releases)
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/commits/v6.0.0)

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

Require open3 before using it

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

Bump puma from 3.12.6 to 4.3.5

Bumps [puma](https://github.com/puma/puma) from 3.12.6 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/commits)

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

Bump http_accept_language from 2.0.5 to 2.1.1

Bumps [http_accept_language](https://github.com/iain/http_accept_language) from 2.0.5 to 2.1.1.
- [Release notes](https://github.com/iain/http_accept_language/releases)
- [Commits](https://github.com/iain/http_accept_language/compare/v2.0.5...v2.1.1)

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

Bump eslint from 6.8.0 to 7.3.1

Bumps [eslint](https://github.com/eslint/eslint) from 6.8.0 to 7.3.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/v6.8.0...v7.3.1)

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

Enable dependabot

Update bundle

Fix new rubocopy warnings

Update bundle

Drop any pluralizable translations that are missing an "other" key

Localisation updates from https://translatewiki.net.

Change tile licence

This changes the text describing the tile licence as per decision of the OSMF board starting July 1st 2020

Drop any pluralizable translations that are missing an "other" key

Localisation updates from https://translatewiki.net.

Update rails to 6.0.3.2

Drop any pluralizable translations that are missing an "other" key

Update bundle

Closes #2659

Localisation updates from https://translatewiki.net.

Fix new erblint warnings

Fix new rubocop warnings

Update bundle

Drop any pluralizable translations that are missing an "other" key

Check that pluralizable translations have an "other" key

Localisation updates from https://translatewiki.net.

Show user delete links to admins

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

Rework user#set_status and #delete to avoid GET requests

This renames the delete action to destroy, and starts using resourceful
routing for user actions.

Localisation updates from https://translatewiki.net.

Rename `many` keys to `other` for the cs locale.

Fixes #2645

Update bundle

More improvements to locale selection for the data browser

Use the browser language preferences for non-logged in users.

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

Improve selection of name to display in data browser

If the user is logged in then consider all their preferred
languages rather than just the UI language, and use the full
locale matching algorithm instead of just checking parents.

Fixes #2636

Improve locale selection algorithm

Don't include locales which only have rails translations in
the candidates, and ensure that user specified options take
priority over less specific variants of earlier choices.

Localisation updates from https://translatewiki.net.

Fix new rubocop warnings

Update bundle

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

Rename friend to friendship in notifier

Followup to #2269

Move make_friend and remove_friend to friendships controller

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

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

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

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

Move friendship related tests to separate file

Convert lib files to model concerns

Remove some unused scripts

Merge pull request #2624 from francois2metz/diary-entry

Add link to my diary in the diary index

Use rails 6.0 framework defaults

Keep the old autoloader and utf-8 forms as they were, for now.

Remove the framework defaults initializer for 5.2

We're already using these defaults, as per 6a25ee9ec962bc10997a4c62a6246873130d41a1
so we don't need to keep this file

Remove ineffective query cache disable initializer

This doesn't have any effect, since there is no middleware by that name.

Localisation updates from https://translatewiki.net.

Update bundle

Localisation updates from https://translatewiki.net.

Update bundle

Update to rails 6.0.3.1