Commit graph

14942 commits

Author SHA1 Message Date
Andy Allan
721f8e00b2
Merge pull request #4919 from rkoeze/rkoeze/add-github-pr-template
Add pull request template
2024-10-16 17:19:41 +01:00
Andy Allan
96984421ad
Merge pull request #5216 from kcne/teaspoon-v2
Re-enable JavaScript unit tests using Teaspoon
2024-10-16 16:55:33 +01:00
Andy Allan
b0ffe17cec
Merge pull request #4988 from nenad-vujicic/issue_4912_pr_labeling
Added workflow for PR labeling using Danger
2024-10-16 14:29:59 +01:00
Andy Allan
33d6580f41
Rephrase translation label, and fix link to docs 2024-10-16 14:29:39 +01:00
Tom Hughes
877716c72a Merge remote-tracking branch 'upstream/pull/5263' 2024-10-16 00:32:52 +01:00
dependabot[bot]
dcb8113da5
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>
2024-10-15 23:20:06 +00:00
Tom Hughes
8c2d6cbed6 Keep zeitwerk at 2.6 for ruby 3.1 support 2024-10-15 18:38:21 +01:00
Tom Hughes
99f220cf69 Fix new rubocop warnings 2024-10-15 18:25:30 +01:00
Tom Hughes
67f28108ec Update bundle 2024-10-15 18:22:24 +01:00
Anton Khorev
29cc3d2b04 Merge branch 'pull/5260' 2024-10-15 14:19:25 +03:00
mmd-osm
1998051704 Remove Nominatim prefixes mention in contributors guide
See https://github.com/openstreetmap/openstreetmap-website/issues/5258#issuecomment-2410282588
2024-10-14 23:50:02 +02:00
translatewiki.net
43a45e1658
Localisation updates from https://translatewiki.net. 2024-10-14 14:15:53 +02:00
Emin Kocan
40c71f28be Enable eslint and fix eslint errors for osm_test.js 2024-10-12 21:02:10 +02:00
Emin Kocan
e5c5776e65 Add step for creation tmp/pids in test workflow 2024-10-12 20:50:57 +02:00
Emin Kocan
b17517e02c Disable eslint for js test files to test for github-ci 2024-10-12 20:50:56 +02:00
Emin Kocan
5c7b7383e7 Use chai assertion style 2024-10-12 20:50:56 +02:00
Emin Kocan
123c7d10a5 Selenium driver working on local 2024-10-12 20:50:38 +02:00
Andy Allan
1c47363ae3 Run javascript tests in CI 2024-10-12 20:47:26 +02:00
Andy Allan
9266180344 Use teaspoon to run javascript tests
Refs #2595
2024-10-12 20:47:26 +02:00
Tom Hughes
3189e656e2 Merge remote-tracking branch 'upstream/pull/5254' 2024-10-09 19:14:42 +01:00
mmd-osm
fb73d0770b Update link for Austria data sources
Fixes #5253. As requested by LWG.
2024-10-09 17:54:35 +02:00
Tom Hughes
86893378ec Merge remote-tracking branch 'upstream/pull/5250' 2024-10-08 18:39:07 +01:00
Tom Hughes
2626f439e4 Update bundle 2024-10-08 18:35:47 +01:00
translatewiki.net
8ef6d15f4f
Localisation updates from https://translatewiki.net. 2024-10-07 14:15:25 +02:00
Martin Raifer
a2a5af6146
Update to iD v2.30.4 2024-10-07 12:09:32 +02:00
Nenad Vujicic
e307b9037a 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.
2024-10-07 11:21:16 +02:00
Tom Hughes
acd899d26d Merge remote-tracking branch 'upstream/pull/5249' 2024-10-06 18:35:50 +01:00
dependabot[bot]
2cc0682964
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>
2024-10-04 23:24:29 +00:00
Tom Hughes
4a8ef3e26c Merge remote-tracking branch 'upstream/pull/5248' 2024-10-03 17:53:32 +01:00
translatewiki.net
8ada57d5e4
Localisation updates from https://translatewiki.net. 2024-10-03 14:15:03 +02:00
Andy Allan
1f67fc77df
Merge pull request #5247 from tomhughes/rails-72-defaults
Switch to rails 7.2 defaults
2024-10-03 11:58:19 +01:00
Tom Hughes
a218fcccbb Switch to rails 7.2 defaults 2024-10-02 19:16:37 +01:00
Tom Hughes
ad2e50fcfb Merge remote-tracking branch 'upstream/pull/5245' 2024-10-02 18:36:03 +01:00
Andy Allan
5720968323
Merge pull request #5070 from tomhughes/rails72
Update to rails 7.2.0
2024-10-02 17:00:26 +01:00
Andy Allan
83425edd8d 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
2024-10-02 16:37:32 +01:00
Martin Raifer
7a38523b36
Update to iD v2.30.3 2024-10-02 15:26:01 +02:00
Tom Hughes
e8da505518 Merge remote-tracking branch 'upstream/pull/5242' 2024-10-01 19:14:01 +01:00
Tom Hughes
745882f5df Update bundle 2024-10-01 19:12:23 +01:00
Nenad Vujicic
f862880a6c 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.
2024-09-30 22:44:05 +02:00
Tom Hughes
edd04ef67a Merge remote-tracking branch 'upstream/pull/5243' 2024-09-30 19:15:10 +01:00
Tom Hughes
cd4c4967fb Merge remote-tracking branch 'upstream/pull/5241' 2024-09-30 19:08:12 +01:00
Nenad Vujicic
7f6028cd7d 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)
2024-09-30 17:52:33 +02:00
Nenad Vujicic
5ff17da0d7 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.
2024-09-30 15:18:18 +02:00
translatewiki.net
73fc534cb6
Localisation updates from https://translatewiki.net. 2024-09-30 14:15:17 +02:00
translatewiki.net
54070efb13
Localisation updates from https://translatewiki.net. 2024-09-26 14:18:48 +02:00
Tom Hughes
2cb51410d8 Merge remote-tracking branch 'upstream/pull/5238' 2024-09-25 18:26:39 +01:00
Nenad Vujicic
0f7eb71d62 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.
2024-09-25 13:08:48 +02:00
Tom Hughes
93da4252bd Update bundle 2024-09-24 18:16:23 +01:00
Tom Hughes
3fa324f311 Merge remote-tracking branch 'upstream/pull/5237' 2024-09-24 18:13:28 +01:00
dependabot[bot]
c9a3629160
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>
2024-09-24 17:12:13 +00:00