Merge pull request #4919 from rkoeze/rkoeze/add-github-pr-template

Add pull request template

Merge pull request #5216 from kcne/teaspoon-v2

Re-enable JavaScript unit tests using Teaspoon

Merge pull request #4988 from nenad-vujicic/issue_4912_pr_labeling

Added workflow for PR labeling using Danger

Rephrase translation label, and fix link to docs

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

Bump coverallsapp/github-action from 2.3.0 to 2.3.2

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.0 to 2.3.2.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.3.0...v2.3.2)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Keep zeitwerk at 2.6 for ruby 3.1 support

Fix new rubocop warnings

Update bundle

Merge branch 'pull/5260'

Remove Nominatim prefixes mention in contributors guide

See https://github.com/openstreetmap/openstreetmap-website/issues/5258#issuecomment-2410282588

Localisation updates from https://translatewiki.net.

Enable eslint and fix eslint errors for osm_test.js

Add step for creation tmp/pids in test workflow

Disable eslint for js test files to test for github-ci

Use chai assertion style

Selenium driver working on local

Run javascript tests in CI

Use teaspoon to run javascript tests

Refs #2595

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

Update link for Austria data sources

Fixes #5253. As requested by LWG.

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

Update bundle

Localisation updates from https://translatewiki.net.

Update to iD v2.30.4

Added workflow for PR labeling using Danger

Workflow is called when PR is created or updated. It checks if PR is too big (>500 changed lines), changes one of translation files (YML, except en.yml) or contains merge-commits and generates appropriate labels.

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

Bump eslint from 9.11.1 to 9.12.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.11.1 to 9.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/v9.11.1...v9.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 remote-tracking branch 'upstream/pull/5248'

Localisation updates from https://translatewiki.net.

Merge pull request #5247 from tomhughes/rails-72-defaults

Switch to rails 7.2 defaults

Switch to rails 7.2 defaults

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

Merge pull request #5070 from tomhughes/rails72

Update to rails 7.2.0

Move api error handling and timeouts to parent class

Fixes #4861

Since the around_action is defined before authorize_resource is called,
the handler needs to pass on the CanCan::AccessDenied exception.

I've added the timeouts where I think they were missing (e.g. UserPreferencesController)
but I've kept the exception for changeset#upload and traces#create

Update to iD v2.30.3

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

Update bundle

Ignores activerecord translation keys as unused

Adds activerecord.errors.models.user_mute.{attributes.subject.format, is_already_muted} under ignore_unused (in i18n-tasks.yml) so they are not reported as unused anymore.

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

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

Masked off reporting as unused various keys

Added time.formats.{blog, friendly} translation keys under ignore_unused in i18n-tasks.yml since used on numerous places for formatting dates / times, removed site.sidebar.close because started being used at 3a51160 and ended being used at 6adcce4, removed sessions.new.title because started being used at f18baae and has been used only in test/system/issues_test.rb (from which we removed it because tests are always in EN)

Removed unused translations in user_blocks

Removed user_blocks.show.{confirm, needs_view, show} translation keys added at daa2496. confirm and show has never been used, needs_view ended being used at ca06b3c.

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

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

Removed various unused translation keys

Removed changeset_comments.feeds.comments.comment (5cd417f / 2cf3861), issues.index.link_to_reports (79bd177 / 05ae075) and sessions.new.register now (5197124 / 9649b19) translation keys.

Update bundle

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

Bump webrick from 1.8.1 to 1.8.2

Bumps [webrick](https://github.com/ruby/webrick) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/ruby/webrick/releases)
- [Commits](https://github.com/ruby/webrick/compare/v1.8.1...v1.8.2)

---
updated-dependencies:
- dependency-name: webrick
  dependency-type: indirect
...

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

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

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

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

Removed unused translation keys in users.*

Removed users.new.tou (added 9649b19 and has never been used), users.terms.decline replaced with users.terms.cancel and together with users.terms.continue started being used at /users/terms.html.erb (both were added at 9a9e13a and removed at 1be8d59)

Fixed unused translation keys in diary_entries.*

Removed diary_entries.location.{edit,view} unused translation keys. They were started using at 0b913ef and ended using at 53fc3e8 / aa121fa.

Bump eslint from 9.11.0 to 9.11.1

Bumps [eslint](https://github.com/eslint/eslint) from 9.11.0 to 9.11.1.
- [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/v9.11.0...v9.11.1)

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

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

Localisation updates from https://translatewiki.net.

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

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

Trace import: validate background job results

OCI: ignore invalid replacement token

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

Bump eslint from 9.10.0 to 9.11.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.10.0 to 9.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/v9.10.0...v9.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>

Merge branch 'pull/5228'

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

Bump puma from 5.6.8 to 5.6.9

Bumps [puma](https://github.com/puma/puma) from 5.6.8 to 5.6.9.
- [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.8...v5.6.9)

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

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

Drop ignore of removed creation_ip column

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

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

Don't include stack backtraces on xml errors when importing traces

Suppress writing xml parse errors to stderr

Removed unused translation keys from changesets.*

Removed unused translation keys changesets.{changeset.anonymous, no_such_entry.title} from en.yml. .anonymous was added in fddda4e and was stopped being used in 3e305fb. .title was added in f0764d3 but never used.

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

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

Bump google-protobuf from 3.25.4 to 3.25.5

Bumps [google-protobuf](https://github.com/protocolbuffers/protobuf) from 3.25.4 to 3.25.5.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.25.4...v3.25.5)

---
updated-dependencies:
- dependency-name: google-protobuf
  dependency-type: indirect
...

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

Merge branch 'pull/5117'

Don't use ?: in "Comment from user" changeset discussion strings

Localisation updates from https://translatewiki.net.

Merge branch 'pull/5209'

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

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

Added greeting to friendship notification

Added greeting 'Hi {user display name},' to friendship notification email. As a side effect, user_mailer.friendship_notification.hi is not anymore reported as unused.

Fix warnings about tests with no assertions

Update to rails 7.2.0

Drop support for ruby 3.0

Also add Ubuntu 24.04 and drop 20.04 as 24.04 is needed for
ruby 3.1 without rvm so we should test it.

Update bundle

Remove unnecessary comma from several translatable messages

Merge branch 'pull/5212'

Drop creation_ip column

Merge branch 'pull/5218'

Ignore the creation_ip column which is no longer used

Replace creation_ip with creation_address

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

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

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

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

Remove unused Namefinder translation strings

Namefinder was introduced in commit d2bd786 and later removed in fcebfd1f. Since then, these translation strings are unused.

Analysis using: `git log -p -S "towns" -- ':(exclude)*config/locales/*.yml' ':(exclude)*vendor/assets/*'`

Remove unused .greeting translation in changeset_comment_notification

Text and html templates use .hi instead

Remove unused translation key users.new.external auth

Unused since commit 0c7c950149888777e186e2eb7525b37f340bc6f0

Ignore users.auth_failure.* as unused translation

Translation keys are used for OmniAuth callbacks, and defined by the
respective OmniAuth provider. It is expected that these strings are
unsued in the OSM website repo.