cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14967 commits 4 branches 1 tag 499 MiB
Commit graph

14967 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
0218e98bc2 Bundle update for rails 7.2.1 2024-10-02 17:16:21 +01:00
Andy Allan
1633059dbb Switch to canonical-rails from master, with rails 7.2.1+ compatibility 2024-10-02 17:15:54 +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
Tom Hughes
ac31625f1b Merge remote-tracking branch 'upstream/pull/5236' 2024-09-24 18:07:47 +01:00
Tom Hughes
ea5b8c90db Merge remote-tracking branch 'upstream/pull/5235' 2024-09-24 18:06:20 +01:00
Tom Hughes
06d03c8acc Merge remote-tracking branch 'upstream/pull/5234' 2024-09-24 18:04:39 +01:00
Nenad Vujicic
b0ad96ebd4 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)
 2024-09-24 16:03:23 +02:00
Nenad Vujicic
72fcf73f2b 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.
 2024-09-24 15:55:25 +02:00
dependabot[bot]
1caaae1141
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>
 2024-09-23 23:11:16 +00:00
translatewiki.net
8b158758a0
Localisation updates from https://translatewiki.net. 2024-09-23 14:15:17 +02:00
Tom Hughes
8a685b70e8 Merge remote-tracking branch 'upstream/pull/5232' 2024-09-22 17:08:47 +01:00
Tom Hughes
7af9a60ecc Merge remote-tracking branch 'upstream/pull/5231' 2024-09-22 17:07:45 +01:00
mmd-osm
72d61f2924 Trace import: validate background job results 2024-09-21 22:30:30 +02:00
mmd-osm
ac42afefcd OCI: ignore invalid replacement token 2024-09-21 09:17:03 +02:00
Tom Hughes
ac26e8eebd Merge remote-tracking branch 'upstream/pull/5230' 2024-09-21 00:18:54 +01:00
dependabot[bot]
a7de82d232
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>
 2024-09-20 23:10:43 +00:00
Anton Khorev
5058e7d748 Merge branch 'pull/5228' 2024-09-21 01:56:25 +03:00
Tom Hughes
936b40fbbd Merge remote-tracking branch 'upstream/pull/5229' 2024-09-20 22:38:26 +01:00
dependabot[bot]
c6ef508874
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>
 2024-09-20 19:25:11 +00:00
Tom Hughes
81bb20c3e6 Drop ignore of removed creation_ip column 2024-09-20 19:21:58 +01:00
Tom Hughes
0bf56cd3ce Merge remote-tracking branch 'upstream/pull/5226' 2024-09-20 19:19:13 +01:00
Tom Hughes
d711d3cb84 Merge remote-tracking branch 'upstream/pull/5223' 2024-09-20 19:18:11 +01:00
Anton Khorev
81bac0b09b Don't include stack backtraces on xml errors when importing traces 2024-09-20 16:36:54 +03:00
Anton Khorev
f2e302c6a8 Suppress writing xml parse errors to stderr 2024-09-20 16:36:30 +03:00
Nenad Vujicic
3f27dc3abb 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.
 2024-09-19 23:30:02 +02:00
Tom Hughes
578a3aebaf Merge remote-tracking branch 'upstream/pull/5225' 2024-09-19 18:05:14 +01:00
Tom Hughes
f9e29ff7cf Merge remote-tracking branch 'upstream/pull/5227' 2024-09-19 18:04:00 +01:00
dependabot[bot]
b34de25b11
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>
 2024-09-19 16:28:30 +00:00