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

Update bundle

add banner for sotm 2022

Localisation updates from https://translatewiki.net.

Update to rails 7.0.3.1

Update bundle

Localisation updates from https://translatewiki.net.

Add a configuration option to disable HTTP basic authentication

Log any use of basic authentication

There is no need to do setup_user_auth and authorize for the same action

Localisation updates from https://translatewiki.net.

Update bundle

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

Bump eslint from 8.18.0 to 8.19.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.18.0 to 8.19.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.18.0...v8.19.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.

Localisation updates from https://translatewiki.net.

Fix new rubocop warning

Update bundle

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

Bump qs from 6.10.5 to 6.11.0

Bumps [qs](https://github.com/ljharb/qs) from 6.10.5 to 6.11.0.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.5...v6.11.0)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Localisation updates from https://translatewiki.net.

Fix eslint warnings

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Update bundle

Restore intended title for GPS trace view

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

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

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

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

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

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

Fix map edit controls min-zoom behaviour

The map dropdown and tooltip of the map edit controls should
behave similar when zooming in and out.
This is achieved by disabling the button-group and the buttons.

Bump eslint from 8.17.0 to 8.18.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.17.0 to 8.18.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.17.0...v8.18.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.

Update to iD v2.21.1

Fix small error in _header.html.erb

only parse hashParams if there is a hash

Presumably this was an oversight in the original implementation, as `OSM.params` falls back to the page's `query` string if the function's parameter (here: the page's `hash`) is an empty string.

This fixes some inconsistent behaviour of the website. In the example below, the first URL sets the `background` to `none` while in the second example it doesn't.

* https://www.openstreetmap.org/edit.html?background=none
* https://www.openstreetmap.org/edit.html?background=none#map=…

Fix new rubocop warnings

Update bundle

Localisation updates from https://translatewiki.net.

Remove duplicate keys from en locale data

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

Margins for 'comment from' / 'reported by' lines on issues page

Add validation for relation member roles

Fixes #3563

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

Wrap issue comment rich text in div

Wrap issue report rich text in div

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

Update copyright notice

Updated in accordance with LWG decision to better reflect updated
guidance, including providing a link to the Attribution Guidelines.

Closes #3565

Localisation updates from https://translatewiki.net.

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

Rename id_oauth_application to id_application in settings

Bump qs from 6.10.3 to 6.10.5

Bumps [qs](https://github.com/ljharb/qs) from 6.10.3 to 6.10.5.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.3...v6.10.5)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

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

Localisation updates from https://translatewiki.net.

Update bundle

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

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

Bump eslint from 8.16.0 to 8.17.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.16.0 to 8.17.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.16.0...v8.17.0)

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

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

Update to iD v2.21.0

major changes in this release:
* dropped support for Internet Explorer 11
* switched authentication to OAuth 2

for further changes please refer to https://github.com/openstreetmap/iD/blob/release/CHANGELOG.md#2210

Localisation updates from https://translatewiki.net.

Fix highway crossing in nominatim description terms

The entry is syntactically wrong. The description terms expect a list of values for each key.

Given that 'crossing' is not a main tag, the key shouldn't be featured in the list at all. I've added highway=crossing instead.

Localisation updates from https://translatewiki.net.

Update bundle

Set a timeout on HTTP requests made by the server

Localisation updates from https://translatewiki.net.

Update bundle

Localisation updates from https://translatewiki.net.

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

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

Bump eslint from 8.15.0 to 8.16.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.15.0 to 8.16.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.15.0...v8.16.0)

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

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

Drop AOL and Wordpress login links

Fixes #3555

Localisation updates from https://translatewiki.net.

Add "garden" to map key

Make map key list "common, meadow, garden" instead of just "common, meadow".

This is in response to a DWG ticket ( #2022051810000111) where a resident complained that their private garden was "listed as 'common, meadow' " in OSM because they consulted the map key. Listing "garden" along these should clear up that misunderstanding.

Fix new rubocop warnings

Update bundle

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

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

Localisation updates from https://translatewiki.net.

Bump leaflet.locatecontrol from 0.76.0 to 0.76.1

Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.76.0 to 0.76.1.
- [Release notes](https://github.com/domoritz/leaflet-locatecontrol/releases)
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.76.0...v0.76.1)

---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Localisation updates from https://translatewiki.net.

Use a secondary-actions nav for issue actions

This fits with actions on other pages, avoids using pipe characters,
and resolves an issue with empty paragraphs.

Teach database structure normalise to ignore btree_gist comment

Update to rails 7.0.3

Update bundle

Localisation updates from https://translatewiki.net.

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

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

Disable some Style/RedundantCondition corrections temporarily

https://github.com/rubocop/rubocop/issues/10605

Update bundle

Bump eslint from 8.14.0 to 8.15.0

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

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

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

Put issue comments through kramdown formatter

On issue comments (which only admins can create or see), put the `body` text through kramdown formatting.

Add some basic testing of issue_comment model

A factory and a basic test of validation for the issue_comment model, similar to what we have for diary_comment.

Localisation updates from https://translatewiki.net.

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

Report verification render not redirect

Fix an issue with the report verification, causing it to lose the text of a report if the user fails to fill in a category.

By using a `render` instead of a `redirect_to`, the rails standard verification behaviour works better. It means we also get a nice red "can't be blank" message highlighting the specific missing field.

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

Update bundle

Localisation updates from https://translatewiki.net.