Merge branch 'master' into HEAD

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

Bump eslint from 8.13.0 to 8.14.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.13.0 to 8.14.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.13.0...v8.14.0)

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

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

Cancel workflow runs which get superseded automatically

Localisation updates from https://translatewiki.net.

Fix eslint warning

Update bundle

Update to leaflet 1.8.0

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

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

Update bundle

Check API status before authorizing access

Fixes #3530

Make database_offline mode work

Fixes #3529

Localisation updates from https://translatewiki.net.

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

Bump eslint from 8.12.0 to 8.13.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.12.0 to 8.13.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.12.0...v8.13.0)

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

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

Localisation updates from https://translatewiki.net.

Merge pull request #3495 from mmd-osm/patch/json_cs

JSON output added to changeset(s) endpoints

Rubocop autofix: ambiguous operator precedence

This simply adds braces to clarify which mathematical operator comes
first.

Update bundle

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

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

Bump puma from 5.6.2 to 5.6.4

Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.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.6.2...v5.6.4)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:development
...

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

Uniqify counts for containing ways and relations on browse pages

Fixes #3519

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

Use factories for tag uniqueness tests

Simplify changeset tag tests by using factories

This saves lots of boilerplate in creating a valid test object

Rework 'empty' tag tests

These tests were checking that the parent object was set, but this
was not obvious from the way that the tests were named and constructed.

This refactoring makes it clearer what is being checked.

Merge pull request #3516 from danieldegroot2/wiki

Add initial capital letter

Update bundle

Add initial capital letter

Localisation updates from https://translatewiki.net.

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

Bump eslint from 8.11.0 to 8.12.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.11.0 to 8.12.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.11.0...v8.12.0)

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

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

Merge pull request #3510 from danieldegroot2/aid-school

Add initial capital letters for Nominatim

Merge pull request #3508 from danieldegroot2/sportsclub

Change spelling for club=sport

Add initial capital letters for Nominatim

Change spelling for club=sport

Re-enable the Rails/MigrationClassName cop

Update bundle

Merge pull request #3506 from danieldegroot2/website

Make spelling for "website" consistent

Update spelling for "website" to current standard

Removed redundant space in "web site".

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

Bump actions/cache from 2.1.7 to 3

Bumps [actions/cache](https://github.com/actions/cache) from 2.1.7 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.7...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Localisation updates from https://translatewiki.net.

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

Fix SVG query icon font

Localisation updates from https://translatewiki.net.

Fix new rubocop warnings

Disable broken cop

https://github.com/rubocop/rubocop-rails/issues/659

Update bundle

JSON output added to changeset(s) endpoints

Localisation updates from https://translatewiki.net.

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

Bump eslint from 8.10.0 to 8.11.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.10.0 to 8.11.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.10.0...v8.11.0)

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

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

Localisation updates from https://translatewiki.net.

Mark redirects which need to be open with allow_other_host

Merge pull request #3486 from tomhughes/vips

Switch to using vips for image processing

Add vips to brew install list

Remove imagemagick from dependencies

Merge pull request #3491 from tomhughes/legacy-trace

Remove support for legacy trace files

Merge pull request #3492 from harry-wood/oauth-doc

OAuth updates to CONFIGURE doc + cosmetic tweak

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

Update to rails 7.0.2.3

JSON output added to permissions endpoint

Fix some Naming/AccessorMethodName rubocop warnings

Fix Lint/DuplicateBranch rubocop warnings

Update bundle

Make oauth register app link into button

Cosmetic tweak. On the OAuth 1 setting tab, make "Register your app" into a button not a link

Also put the applications in a <ul>

Update CONFIGURE instructions for oauth

Update the instructions in CONFIGURE.md on how to set-up the built-in apps. Need to clarify that iD is on OAuth1, which is a little different from the 'web site' (Notes) set-up on OAuth2. Also iD requires more permissions these days.

Localisation updates from https://translatewiki.net.

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

More readable multi-line ruby in erbs

A couple of erb files had unnecessary start and end erb tags around every line in a multi-line block of ruby. More readable this way.

Add newline to align with blocks_by

`blocks_on.html.erb` is almost identical to `block_by.html.erb`. Add a newline to align with the other file (makes it easier to see the more subtle important difference)

Fix minor HTML tag mismatches

Fix some HTML tag mismatches and other glitches. These are minor, and don't appear to cause browsers any problems, but for the sake of correctness:
* A closing td which should be a closing div.
* A closing h3 for a corresponding h6
* Two tables with `<thead>` tag and missing `<tr>` around the `<th>` headings.

test change for thead fix

Fix some rubocop Naming/PredicateName warnings

Remove support for legacy trace files

Switch to using vips for image processing

Drop support for Ubuntu 18.04

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

Merge branch 'pull/3472'

Fix redirecting links to osmfoundation.org

Fix some links to osmfoundation.org pages which are redirecting (not broken links but this is just avoiding a slightly messy redirection)

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

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

Bump image_processing from 1.12.1 to 1.12.2

Bumps [image_processing](https://github.com/janko/image_processing) from 1.12.1 to 1.12.2.
- [Release notes](https://github.com/janko/image_processing/releases)
- [Changelog](https://github.com/janko/image_processing/blob/master/CHANGELOG.md)
- [Commits](https://github.com/janko/image_processing/compare/v1.12.1...v1.12.2)

---
updated-dependencies:
- dependency-name: image_processing
  dependency-type: direct:production
...

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

Bump actions/checkout from 2.4.0 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.4.0...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Fix rubocop Rails/TimeZone warnings

Enable open redirect protection

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

Update bundle

Remove redundant presence validation on belongs_to

There's no need for us to have it when rails does this for us.

Restore asset debugging in development mode

Fix opensearch icon & update attribution

Fixes #3478
Closes #3479

Localisation updates from https://translatewiki.net.

Add missing PG_MODULE_MAGIC to database function source

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

Bump eslint from 8.9.0 to 8.10.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.9.0 to 8.10.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.9.0...v8.10.0)

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

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

Localisation updates from https://translatewiki.net.