]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Fri, 8 Nov 2024 08:03:41 +0000 (08:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5307'
Tom Hughes [Fri, 8 Nov 2024 08:03:28 +0000 (08:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5304'
Anton Khorev [Thu, 7 Nov 2024 08:39:54 +0000 (11:39 +0300)]
Replace query marker fade animation with css
Anton Khorev [Wed, 23 Oct 2024 15:20:25 +0000 (18:20 +0300)]
Backfill note subscriptions
Tom Hughes [Thu, 7 Nov 2024 18:49:45 +0000 (18:49 +0000)]
Merge remote-tracking branch 'upstream/pull/4464'
gobinathal [Mon, 8 Jan 2024 16:59:34 +0000 (22:29 +0530)]
Remove hardcoded rate limit value
Name is chosen to match the equivalent setting in the configuration
of the rate limits for edits.
Fixes #4427.
translatewiki.net [Thu, 7 Nov 2024 12:13:21 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 5 Nov 2024 18:22:02 +0000 (18:22 +0000)]
Fix new rubocop warnings
Tom Hughes [Tue, 5 Nov 2024 18:12:25 +0000 (18:12 +0000)]
Update bundle
translatewiki.net [Tue, 5 Nov 2024 14:31:10 +0000 (15:31 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 4 Nov 2024 19:02:14 +0000 (19:02 +0000)]
Merge remote-tracking branch 'upstream/pull/5301'
Nenad Vujicic [Mon, 4 Nov 2024 15:54:30 +0000 (16:54 +0100)]
Added new Danger labeling rule
Added new rule which checks if Gemfile is updated and Gemfile.lock is not updated and if positive generates "gemfile-lock-outdated" PR label.
translatewiki.net [Mon, 4 Nov 2024 12:13:41 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 3 Nov 2024 18:53:12 +0000 (18:53 +0000)]
Merge remote-tracking branch 'upstream/pull/5299'
dependabot[bot] [Fri, 1 Nov 2024 23:03:47 +0000 (23:03 +0000)]
Bump eslint from 9.13.0 to 9.14.0
Bumps [eslint](https://github.com/eslint/eslint) from 9.13.0 to 9.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/v9.13.0...v9.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>
Tom Hughes [Thu, 31 Oct 2024 18:00:39 +0000 (18:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5284'
translatewiki.net [Thu, 31 Oct 2024 12:14:06 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 31 Oct 2024 08:33:36 +0000 (08:33 +0000)]
Update to rails 7.2.2
Tom Hughes [Wed, 30 Oct 2024 18:41:43 +0000 (18:41 +0000)]
Adjust imports for leaflet.locatecontrol
Tom Hughes [Wed, 30 Oct 2024 18:31:52 +0000 (18:31 +0000)]
Merge remote-tracking branch 'upstream/pull/5296'
dependabot[bot] [Tue, 29 Oct 2024 23:27:14 +0000 (23:27 +0000)]
Bump leaflet.locatecontrol from 0.81.1 to 0.82.0
Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.81.1 to 0.82.0.
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.81.1...v0.82.0)
---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Tue, 29 Oct 2024 18:14:36 +0000 (18:14 +0000)]
Update bundle
Anton Khorev [Wed, 23 Oct 2024 22:37:39 +0000 (01:37 +0300)]
Subscribe users when they interact with notes
Anton Khorev [Tue, 22 Oct 2024 23:08:27 +0000 (02:08 +0300)]
Create note subscription table and model
Andy Allan [Sun, 27 Oct 2024 12:31:51 +0000 (12:31 +0000)]
Merge pull request #5290 from tomhughes/danger
Improvements to danger workflow
Tom Hughes [Sun, 27 Oct 2024 10:07:39 +0000 (10:07 +0000)]
Merge remote-tracking branch 'upstream/pull/5292'
Tom Hughes [Sun, 27 Oct 2024 10:06:13 +0000 (10:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5291'
Amir E. Aharoni [Sat, 26 Oct 2024 13:22:12 +0000 (09:22 -0400)]
Consistent use of quotes
Most strings used single quotes, and a few used
opening backticks. Now it's single quotes everywhere.
Amir E. Aharoni [Sat, 26 Oct 2024 13:31:58 +0000 (09:31 -0400)]
Add articles before "exit" and "roundabout"
There are articles before "ramp" everywhere,
and it sounds more correct with articles
before "exit" and "roundabout", too.
Tom Hughes [Sat, 26 Oct 2024 11:17:38 +0000 (12:17 +0100)]
Make danger labels use consisent capitalisation
Existing labels are all lower case and avoid spaces.
Tom Hughes [Sat, 26 Oct 2024 11:15:44 +0000 (12:15 +0100)]
Avoid suggesting danger is only about labels
Tom Hughes [Sat, 26 Oct 2024 11:12:15 +0000 (12:12 +0100)]
Get danger working in GitHub actions
Tom Hughes [Sat, 26 Oct 2024 10:16:45 +0000 (11:16 +0100)]
Merge remote-tracking branch 'upstream/pull/5289'
Tom Hughes [Sat, 26 Oct 2024 10:13:11 +0000 (11:13 +0100)]
Merge remote-tracking branch 'upstream/pull/5288'
Tom Hughes [Sat, 26 Oct 2024 10:12:24 +0000 (11:12 +0100)]
Merge remote-tracking branch 'upstream/pull/5286'
Tom Hughes [Fri, 25 Oct 2024 18:30:27 +0000 (19:30 +0100)]
Avoid adjusting time by a number of days
Using hours instead of days avoids test failures when moving
past a point in time when the clocks change.
Anton Khorev [Fri, 25 Oct 2024 15:48:36 +0000 (18:48 +0300)]
Remove callback from initialize() in note js controller
Anton Khorev [Fri, 25 Oct 2024 15:22:36 +0000 (18:22 +0300)]
Decrease padding between close button and inputs in directions form
dependabot[bot] [Thu, 24 Oct 2024 23:01:43 +0000 (23:01 +0000)]
Bump coverallsapp/github-action from 2.3.3 to 2.3.4
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.3 to 2.3.4.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.3.3...v2.3.4)
---
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>
translatewiki.net [Thu, 24 Oct 2024 12:17:17 +0000 (14:17 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 24 Oct 2024 07:58:45 +0000 (08:58 +0100)]
Update bundle
Tom Hughes [Thu, 24 Oct 2024 07:57:57 +0000 (08:57 +0100)]
Update to rails 7.2.1.2
Tom Hughes [Thu, 24 Oct 2024 07:57:25 +0000 (08:57 +0100)]
Revert to using released version of canonical-rails
Tom Hughes [Tue, 22 Oct 2024 18:06:19 +0000 (19:06 +0100)]
Get danger working on pull requests
Tom Hughes [Tue, 22 Oct 2024 17:16:19 +0000 (18:16 +0100)]
Update bundle
Tom Hughes [Mon, 21 Oct 2024 21:45:04 +0000 (22:45 +0100)]
Merge remote-tracking branch 'upstream/pull/5276'
Tom Hughes [Mon, 21 Oct 2024 19:34:39 +0000 (20:34 +0100)]
Attempt to get danger working
translatewiki.net [Mon, 21 Oct 2024 12:15:37 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Mon, 21 Oct 2024 11:51:35 +0000 (14:51 +0300)]
Don't show older/newer buttons if all items fit on one page
Tom Hughes [Sun, 20 Oct 2024 16:39:31 +0000 (17:39 +0100)]
Merge remote-tracking branch 'upstream/pull/5274'
Tom Hughes [Sun, 20 Oct 2024 16:38:03 +0000 (17:38 +0100)]
Merge remote-tracking branch 'upstream/pull/5273'
Tom Hughes [Sun, 20 Oct 2024 16:37:49 +0000 (17:37 +0100)]
Merge remote-tracking branch 'upstream/pull/5271'
Anton Khorev [Sun, 20 Oct 2024 16:10:36 +0000 (19:10 +0300)]
Remove "User's Diary" from diary entry og:title
Jakob Miksch [Sun, 20 Oct 2024 09:12:49 +0000 (11:12 +0200)]
Typos in docs
dependabot[bot] [Fri, 18 Oct 2024 23:40:19 +0000 (23:40 +0000)]
Bump eslint from 9.12.0 to 9.13.0
Bumps [eslint](https://github.com/eslint/eslint) from 9.12.0 to 9.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/v9.12.0...v9.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>
Tom Hughes [Thu, 17 Oct 2024 17:41:05 +0000 (18:41 +0100)]
Attempt to get danger working as a CI workflow
References #5267
Tom Hughes [Thu, 17 Oct 2024 17:10:04 +0000 (18:10 +0100)]
Merge remote-tracking branch 'upstream/pull/5268'
translatewiki.net [Thu, 17 Oct 2024 12:16:07 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Wed, 16 Oct 2024 23:06:28 +0000 (23:06 +0000)]
Bump coverallsapp/github-action from 2.3.2 to 2.3.3
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.2 to 2.3.3.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.3.2...v2.3.3)
---
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>
Tom Hughes [Wed, 16 Oct 2024 18:05:50 +0000 (19:05 +0100)]
Update to rails 7.2.1.1
Tom Hughes [Wed, 16 Oct 2024 18:05:18 +0000 (19:05 +0100)]
Merge remote-tracking branch 'upstream/pull/5246'
Tom Hughes [Wed, 16 Oct 2024 17:38:48 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/5266'
Andy Allan [Wed, 16 Oct 2024 16:40:24 +0000 (17:40 +0100)]
Avoid linking to redirects on the osmfoundation website
Andy Allan [Wed, 16 Oct 2024 16:19:41 +0000 (17:19 +0100)]
Merge pull request #4919 from rkoeze/rkoeze/add-github-pr-template
Add pull request template
Andy Allan [Wed, 16 Oct 2024 15:55:33 +0000 (16:55 +0100)]
Merge pull request #5216 from kcne/teaspoon-v2
Re-enable JavaScript unit tests using Teaspoon
Andy Allan [Wed, 16 Oct 2024 13:29:59 +0000 (14:29 +0100)]
Merge pull request #4988 from nenad-vujicic/issue_4912_pr_labeling
Added workflow for PR labeling using Danger
Andy Allan [Wed, 16 Oct 2024 13:29:39 +0000 (14:29 +0100)]
Rephrase translation label, and fix link to docs
Tom Hughes [Tue, 15 Oct 2024 23:32:52 +0000 (00:32 +0100)]
Merge remote-tracking branch 'upstream/pull/5263'
dependabot[bot] [Tue, 15 Oct 2024 23:20:06 +0000 (23:20 +0000)]
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>
Tom Hughes [Tue, 15 Oct 2024 17:38:21 +0000 (18:38 +0100)]
Keep zeitwerk at 2.6 for ruby 3.1 support
Tom Hughes [Tue, 15 Oct 2024 17:25:30 +0000 (18:25 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 15 Oct 2024 17:22:24 +0000 (18:22 +0100)]
Update bundle
Anton Khorev [Tue, 15 Oct 2024 11:19:25 +0000 (14:19 +0300)]
Merge branch 'pull/5260'
mmd-osm [Mon, 14 Oct 2024 21:44:38 +0000 (23:44 +0200)]
Remove Nominatim prefixes mention in contributors guide
See https://github.com/openstreetmap/openstreetmap-website/issues/5258#issuecomment-
2410282588
translatewiki.net [Mon, 14 Oct 2024 12:15:53 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.
Emin Kocan [Sat, 14 Sep 2024 14:47:42 +0000 (16:47 +0200)]
Enable eslint and fix eslint errors for osm_test.js
Emin Kocan [Sat, 14 Sep 2024 13:36:34 +0000 (15:36 +0200)]
Add step for creation tmp/pids in test workflow
Emin Kocan [Sat, 14 Sep 2024 13:21:47 +0000 (15:21 +0200)]
Disable eslint for js test files to test for github-ci
Emin Kocan [Sat, 14 Sep 2024 12:39:42 +0000 (14:39 +0200)]
Use chai assertion style
Emin Kocan [Wed, 11 Sep 2024 23:54:31 +0000 (01:54 +0200)]
Selenium driver working on local
Andy Allan [Wed, 4 Jan 2023 15:23:50 +0000 (15:23 +0000)]
Run javascript tests in CI
Andy Allan [Wed, 4 Jan 2023 15:21:44 +0000 (15:21 +0000)]
Use teaspoon to run javascript tests
Refs #2595
Tom Hughes [Wed, 9 Oct 2024 18:14:42 +0000 (19:14 +0100)]
Merge remote-tracking branch 'upstream/pull/5254'
mmd-osm [Wed, 9 Oct 2024 15:54:35 +0000 (17:54 +0200)]
Update link for Austria data sources
Fixes #5253. As requested by LWG.
Tom Hughes [Tue, 8 Oct 2024 17:39:07 +0000 (18:39 +0100)]
Merge remote-tracking branch 'upstream/pull/5250'
Tom Hughes [Tue, 8 Oct 2024 17:35:47 +0000 (18:35 +0100)]
Update bundle
translatewiki.net [Mon, 7 Oct 2024 12:15:25 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.
Martin Raifer [Mon, 7 Oct 2024 10:09:32 +0000 (12:09 +0200)]
Update to iD v2.30.4
Nenad Vujicic [Mon, 7 Oct 2024 09:13:18 +0000 (11:13 +0200)]
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.
Tom Hughes [Sun, 6 Oct 2024 17:35:50 +0000 (18:35 +0100)]
Merge remote-tracking branch 'upstream/pull/5249'
dependabot[bot] [Fri, 4 Oct 2024 23:24:29 +0000 (23:24 +0000)]
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>
Tom Hughes [Thu, 3 Oct 2024 16:53:32 +0000 (17:53 +0100)]
Merge remote-tracking branch 'upstream/pull/5248'
translatewiki.net [Thu, 3 Oct 2024 12:14:59 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Thu, 3 Oct 2024 10:58:19 +0000 (11:58 +0100)]
Merge pull request #5247 from tomhughes/rails-72-defaults
Switch to rails 7.2 defaults
Tom Hughes [Wed, 2 Oct 2024 18:16:37 +0000 (19:16 +0100)]
Switch to rails 7.2 defaults
Tom Hughes [Wed, 2 Oct 2024 17:36:03 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/5245'
Andy Allan [Wed, 2 Oct 2024 16:16:21 +0000 (17:16 +0100)]
Bundle update for rails 7.2.1
Andy Allan [Wed, 2 Oct 2024 16:15:54 +0000 (17:15 +0100)]
Switch to canonical-rails from master, with rails 7.2.1+ compatibility
Andy Allan [Wed, 2 Oct 2024 16:00:26 +0000 (17:00 +0100)]
Merge pull request #5070 from tomhughes/rails72
Update to rails 7.2.0
Andy Allan [Wed, 2 Oct 2024 15:37:32 +0000 (16:37 +0100)]
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