]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Wed, 31 May 2023 17:38:10 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/4053'
Tom Hughes [Wed, 31 May 2023 17:37:23 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4052'
Tom Hughes [Wed, 31 May 2023 17:37:01 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4051'
Tom Hughes [Wed, 31 May 2023 17:35:38 +0000 (18:35 +0100)]
Merge remote-tracking branch 'upstream/pull/4050'
Andy Allan [Wed, 31 May 2023 15:22:30 +0000 (16:22 +0100)]
Simplify ruby installations
Refs #4048
* We don't currently need a specific version suffix on the package names,
since ubuntu only ships with one ruby version (and newer versions on
e.g. 23.04 are fine).
* We don't need to explicitly install libruby, since it's pulled in by
other packages as required.
* Ubuntu again ships a decent enough version of bundler for our needs,
so we don't need to install it via rubygems.
Andy Allan [Wed, 31 May 2023 15:09:14 +0000 (16:09 +0100)]
Use the db:create command for vagrant provisioning
This is to align with the INSTALL.md instructions
Andy Allan [Wed, 31 May 2023 14:46:18 +0000 (15:46 +0100)]
Use default version of node, but use npm to install yarn
* Node 12 is sufficient for now, and aligns with INSTALL.md and vagrant
* Upstream yarnpkg is completely broken, see
https://bugs.launchpad.net/ubuntu/+source/node-yarnpkg/+bug/
2003697
Refs #4048
Andy Allan [Wed, 31 May 2023 14:06:44 +0000 (15:06 +0100)]
Update vagrant provisioning for 22.04
Refs #4048
* geckodriver is now inside the firefox snap package
* the yarnpkg package is completely broken, see
https://bugs.launchpad.net/ubuntu/+source/node-yarnpkg/+bug/
2003697
Andy Allan [Wed, 31 May 2023 11:07:47 +0000 (12:07 +0100)]
Update workflows to run on Ubuntu 22.04
Tom Hughes [Tue, 30 May 2023 17:57:09 +0000 (18:57 +0100)]
Normalise timestamp types for database structure comparison
Tom Hughes [Tue, 30 May 2023 17:29:32 +0000 (18:29 +0100)]
Update bundle
Tom Hughes [Tue, 30 May 2023 17:20:03 +0000 (18:20 +0100)]
Update to rails 7.0.5
translatewiki.net [Mon, 29 May 2023 11:13:21 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 May 2023 11:15:48 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 24 May 2023 16:55:29 +0000 (17:55 +0100)]
Limit coveralls to reading lcov output
Fixes #4043
Tom Hughes [Tue, 23 May 2023 17:18:37 +0000 (18:18 +0100)]
Update bundle
Tom Hughes [Mon, 22 May 2023 17:06:46 +0000 (18:06 +0100)]
Get docker working on Ubuntu 22.04
translatewiki.net [Mon, 22 May 2023 11:12:41 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 21 May 2023 17:32:23 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/4037'
Tom Hughes [Sun, 21 May 2023 17:32:19 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/4035'
dependabot[bot] [Fri, 19 May 2023 23:56:47 +0000 (23:56 +0000)]
Bump eslint from 8.40.0 to 8.41.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.40.0 to 8.41.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.40.0...v8.41.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Thu, 18 May 2023 23:56:46 +0000 (23:56 +0000)]
Bump leaflet from 1.9.3 to 1.9.4
Bumps [leaflet](https://github.com/Leaflet/Leaflet) from 1.9.3 to 1.9.4.
- [Release notes](https://github.com/Leaflet/Leaflet/releases)
- [Changelog](https://github.com/Leaflet/Leaflet/blob/v1.9.4/CHANGELOG.md)
- [Commits](https://github.com/Leaflet/Leaflet/compare/v1.9.3...v1.9.4)
---
updated-dependencies:
- dependency-name: leaflet
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 18 May 2023 11:15:30 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 16 May 2023 17:57:48 +0000 (18:57 +0100)]
Update minimum ruby version to 3.0
Tom Hughes [Tue, 16 May 2023 17:44:14 +0000 (18:44 +0100)]
Add rubocop-factory_bot and fix warnings
Tom Hughes [Tue, 16 May 2023 17:23:53 +0000 (18:23 +0100)]
Update bundle
Tom Hughes [Tue, 16 May 2023 17:21:21 +0000 (18:21 +0100)]
Merge remote-tracking branch 'upstream/pull/4034'
dependabot[bot] [Mon, 15 May 2023 23:56:36 +0000 (23:56 +0000)]
Bump qs from 6.11.1 to 6.11.2
Bumps [qs](https://github.com/ljharb/qs) from 6.11.1 to 6.11.2.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.11.1...v6.11.2)
---
updated-dependencies:
- dependency-name: qs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Mon, 15 May 2023 11:12:28 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 11 May 2023 11:43:16 +0000 (13:43 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 9 May 2023 09:40:24 +0000 (10:40 +0100)]
Update bundle
translatewiki.net [Mon, 8 May 2023 11:22:46 +0000 (13:22 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 7 May 2023 17:36:15 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4029'
dependabot[bot] [Fri, 5 May 2023 23:56:44 +0000 (23:56 +0000)]
Bump eslint from 8.39.0 to 8.40.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.39.0 to 8.40.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.39.0...v8.40.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 [Tue, 2 May 2023 17:11:26 +0000 (18:11 +0100)]
Update bundle
translatewiki.net [Mon, 1 May 2023 11:15:49 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 30 Apr 2023 17:43:51 +0000 (18:43 +0100)]
Merge remote-tracking branch 'upstream/pull/4013'
Tom Hughes [Sun, 30 Apr 2023 17:32:23 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/4026'
dependabot[bot] [Thu, 27 Apr 2023 23:56:42 +0000 (23:56 +0000)]
Bump osm-community-index from 5.5.1 to 5.5.2
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.1 to 5.5.2.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.5.1...v5.5.2)
---
updated-dependencies:
- dependency-name: osm-community-index
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 27 Apr 2023 11:16:31 +0000 (13:16 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 26 Apr 2023 19:13:00 +0000 (20:13 +0100)]
Merge remote-tracking branch 'upstream/pull/4024'
Martin Raifer [Wed, 26 Apr 2023 17:57:56 +0000 (19:57 +0200)]
Update to iD v2.25.2
Tom Hughes [Wed, 26 Apr 2023 17:19:52 +0000 (18:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4023'
Tom Hughes [Wed, 26 Apr 2023 17:19:30 +0000 (18:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4021'
Andy Allan [Wed, 26 Apr 2023 15:36:22 +0000 (16:36 +0100)]
Use rails to migrate database for vagrant
This brings the vagrant provisioning script into line with the
installation notes, docker and CI.
Andy Allan [Wed, 26 Apr 2023 13:23:57 +0000 (14:23 +0100)]
Remove apache packages from install instructions and vagrant provisioning
These are unnecessary for development environments, and are not used in
the Fedora instructions nor in the Dockerfile.
Tom Hughes [Tue, 25 Apr 2023 17:14:43 +0000 (18:14 +0100)]
Update bundle
Tom Hughes [Tue, 25 Apr 2023 17:13:38 +0000 (18:13 +0100)]
Merge remote-tracking branch 'upstream/pull/4020'
dependabot[bot] [Mon, 24 Apr 2023 23:56:49 +0000 (23:56 +0000)]
Bump js-cookie from 3.0.4 to 3.0.5
Bumps [js-cookie](https://github.com/js-cookie/js-cookie) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/js-cookie/js-cookie/releases)
- [Changelog](https://github.com/js-cookie/js-cookie/blob/main/.release-it.json)
- [Commits](https://github.com/js-cookie/js-cookie/compare/v3.0.4...v3.0.5)
---
updated-dependencies:
- dependency-name: js-cookie
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Mon, 24 Apr 2023 11:17:43 +0000 (13:17 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 23 Apr 2023 15:17:59 +0000 (16:17 +0100)]
Merge remote-tracking branch 'upstream/pull/4017'
Tom Hughes [Sun, 23 Apr 2023 15:17:56 +0000 (16:17 +0100)]
Merge remote-tracking branch 'upstream/pull/4016'
Tom Hughes [Sun, 23 Apr 2023 15:17:48 +0000 (16:17 +0100)]
Merge remote-tracking branch 'upstream/pull/4014'
Tom Hughes [Sun, 23 Apr 2023 15:17:37 +0000 (16:17 +0100)]
Merge remote-tracking branch 'upstream/pull/4011'
dependabot[bot] [Fri, 21 Apr 2023 23:56:56 +0000 (23:56 +0000)]
Bump eslint from 8.38.0 to 8.39.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.38.0 to 8.39.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.38.0...v8.39.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Fri, 21 Apr 2023 23:56:42 +0000 (23:56 +0000)]
Bump js-cookie from 3.0.1 to 3.0.4
Bumps [js-cookie](https://github.com/js-cookie/js-cookie) from 3.0.1 to 3.0.4.
- [Release notes](https://github.com/js-cookie/js-cookie/releases)
- [Changelog](https://github.com/js-cookie/js-cookie/blob/main/.release-it.json)
- [Commits](https://github.com/js-cookie/js-cookie/compare/v3.0.1...v3.0.4)
---
updated-dependencies:
- dependency-name: js-cookie
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Thu, 20 Apr 2023 23:56:46 +0000 (23:56 +0000)]
Bump osm-community-index from 5.5.0 to 5.5.1
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.5.0...v5.5.1)
---
updated-dependencies:
- dependency-name: osm-community-index
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Dan Rademacher [Thu, 20 Apr 2023 17:21:32 +0000 (10:21 -0700)]
Update docker compose to solve stray PID problem
Resolves https://github.com/OpenHistoricalMap/issues/issues/516
dependabot[bot] [Wed, 19 Apr 2023 23:56:51 +0000 (23:56 +0000)]
Bump coverallsapp/github-action from 2.1.0 to 2.1.2
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.1.0 to 2.1.2.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.1.0...v2.1.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 [Mon, 17 Apr 2023 16:49:46 +0000 (17:49 +0100)]
Update bundle
Tom Hughes [Tue, 11 Apr 2023 17:30:32 +0000 (18:30 +0100)]
Remove incorrect translations
translatewiki.net [Mon, 17 Apr 2023 11:14:01 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 13 Apr 2023 11:17:53 +0000 (13:17 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 12 Apr 2023 16:37:35 +0000 (17:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4007'
Andy Allan [Wed, 29 Mar 2023 17:50:44 +0000 (18:50 +0100)]
Add some validations for i18n values
These only apply to the en.yml file for now, but can be expanded
in due course.
Tom Hughes [Wed, 12 Apr 2023 07:23:17 +0000 (08:23 +0100)]
Update bundle
Tom Hughes [Tue, 11 Apr 2023 17:30:32 +0000 (18:30 +0100)]
Remove incorrect translations
Tom Hughes [Tue, 11 Apr 2023 16:52:49 +0000 (17:52 +0100)]
Update rubocop todo
Tom Hughes [Tue, 11 Apr 2023 16:44:30 +0000 (17:44 +0100)]
Update bundle
Tom Hughes [Tue, 11 Apr 2023 16:43:35 +0000 (17:43 +0100)]
Merge remote-tracking branch 'upstream/pull/4004'
Tom Hughes [Tue, 11 Apr 2023 16:43:33 +0000 (17:43 +0100)]
Merge remote-tracking branch 'upstream/pull/4002'
Amir E. Aharoni [Tue, 11 Apr 2023 16:42:58 +0000 (17:42 +0100)]
Update URLs to use https
Closes #4000
dependabot[bot] [Mon, 10 Apr 2023 23:57:28 +0000 (23:57 +0000)]
Bump coverallsapp/github-action from 1.2.4 to 2.1.0
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.2.4 to 2.1.0.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v1.2.4...v2.1.0)
---
updated-dependencies:
- dependency-name: coverallsapp/github-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Mon, 10 Apr 2023 11:14:28 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Fri, 7 Apr 2023 23:56:46 +0000 (23:56 +0000)]
Bump eslint from 8.37.0 to 8.38.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.37.0 to 8.38.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.37.0...v8.38.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 6 Apr 2023 11:17:12 +0000 (13:17 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 4 Apr 2023 17:15:05 +0000 (18:15 +0100)]
Update bundle
Tom Hughes [Sun, 2 Apr 2023 17:39:12 +0000 (18:39 +0100)]
Merge remote-tracking branch 'upstream/pull/3999'
Andy Allan [Wed, 29 Mar 2023 16:07:03 +0000 (17:07 +0100)]
Rework note events to avoid raw html in translations
Andy Allan [Wed, 29 Mar 2023 15:43:58 +0000 (16:43 +0100)]
Rework geocoder titles to avoid raw html in translations
Andy Allan [Wed, 29 Mar 2023 15:11:21 +0000 (16:11 +0100)]
Rework the map attribution to avoid raw html in translations.
Andy Allan [Wed, 29 Mar 2023 13:01:24 +0000 (14:01 +0100)]
Rework the help text to avoid raw html in translations
Unfortunately bootstrap_form has no method for passing interpolation
values to the automatic help text system, so instead we'll use an
explicit override.
Andy Allan [Wed, 29 Mar 2023 10:29:18 +0000 (11:29 +0100)]
Avoid raw html in translations for the note icon
Tom Hughes [Wed, 29 Mar 2023 18:30:25 +0000 (19:30 +0100)]
Merge remote-tracking branch 'upstream/pull/3990'
Tom Hughes [Wed, 29 Mar 2023 18:30:07 +0000 (19:30 +0100)]
Merge remote-tracking branch 'upstream/pull/3985'
Tom Hughes [Wed, 29 Mar 2023 18:25:49 +0000 (19:25 +0100)]
Merge remote-tracking branch 'upstream/pull/3986'
Andy Allan [Wed, 22 Mar 2023 18:36:13 +0000 (18:36 +0000)]
Rework browse pages to avoid raw html in translations
Andy Allan [Wed, 22 Mar 2023 18:07:49 +0000 (18:07 +0000)]
Avoid raw html in translations for changeset comments
Andy Allan [Wed, 22 Mar 2023 17:34:16 +0000 (17:34 +0000)]
Avoid using raw html in translations for the issues index
Andy Allan [Wed, 22 Mar 2023 16:09:46 +0000 (16:09 +0000)]
Avoid using raw html in translations on the about page
dependabot[bot] [Tue, 28 Mar 2023 23:56:46 +0000 (23:56 +0000)]
Bump eslint from 8.36.0 to 8.37.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.36.0 to 8.37.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.36.0...v8.37.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 [Tue, 28 Mar 2023 17:09:04 +0000 (18:09 +0100)]
Update bundle
translatewiki.net [Mon, 27 Mar 2023 15:41:16 +0000 (17:41 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Thu, 23 Mar 2023 09:46:42 +0000 (09:46 +0000)]
Remove unused small.scss symlinks
These should have been removed as part of
5ab682dbbdc0bc4034d1c93aae3d082dae09fa65
Tom Hughes [Wed, 22 Mar 2023 19:15:20 +0000 (19:15 +0000)]
Merge remote-tracking branch 'upstream/pull/3983'
Andy Allan [Wed, 15 Mar 2023 15:21:11 +0000 (15:21 +0000)]
Avoid using raw html in credit translations
Andy Allan [Wed, 15 Mar 2023 14:12:56 +0000 (14:12 +0000)]
Avoid using raw html in translations on the copyright page
Tom Hughes [Wed, 22 Mar 2023 11:00:09 +0000 (11:00 +0000)]
Merge remote-tracking branch 'upstream/pull/3982'
Tom Hughes [Wed, 22 Mar 2023 10:52:02 +0000 (10:52 +0000)]
Merge remote-tracking branch 'upstream/pull/3981'
Andy Allan [Wed, 22 Mar 2023 10:39:32 +0000 (10:39 +0000)]
Merge pull request #3973 from tomhughes/one
Include count in messages for the "one" plural category