]> git.openstreetmap.org Git - rails.git/log
rails.git
17 months agoMerge remote-tracking branch 'upstream/pull/4077'
Tom Hughes [Wed, 5 Jul 2023 14:10:12 +0000 (15:10 +0100)]
Merge remote-tracking branch 'upstream/pull/4077'

17 months agoMerge remote-tracking branch 'upstream/pull/4076'
Tom Hughes [Wed, 5 Jul 2023 14:01:12 +0000 (15:01 +0100)]
Merge remote-tracking branch 'upstream/pull/4076'

17 months agoAvoid using the zero key for pluralisation in English
Andy Allan [Wed, 5 Jul 2023 13:42:07 +0000 (14:42 +0100)]
Avoid using the zero key for pluralisation in English

This makes it impossible to translate to other languages that use the
`zero:` key, e.g. for other numbers that end in zero.

An alternative approach would be possible in future, when ruby-i18n
and rails and translatewiki all have full support for `0:` and `1:` keys.

Fixes #3997

17 months agoExpand raw html checks to all translation files
Andy Allan [Wed, 5 Jul 2023 12:47:12 +0000 (13:47 +0100)]
Expand raw html checks to all translation files

This closes a potential security issue, where unreviewed html could
be added via translation files.

17 months agoMerge remote-tracking branch 'upstream/pull/4075'
Tom Hughes [Wed, 5 Jul 2023 11:52:58 +0000 (12:52 +0100)]
Merge remote-tracking branch 'upstream/pull/4075'

17 months agoRemove obsolete pt-BR.yml translation file
Andy Allan [Wed, 5 Jul 2023 11:04:55 +0000 (12:04 +0100)]
Remove obsolete pt-BR.yml translation file

Translatewiki now pushes pt-BR to pt.yml, which is used for both
pt and pt-BR.

Fixes #3670.

17 months agoUpdate bundle
Tom Hughes [Tue, 4 Jul 2023 17:14:30 +0000 (18:14 +0100)]
Update bundle

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 3 Jul 2023 11:18:06 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.

17 months agoUpdate bundle
Tom Hughes [Sat, 1 Jul 2023 14:22:23 +0000 (15:22 +0100)]
Update bundle

17 months agoUpdate to rails 7.0.6
Tom Hughes [Sat, 1 Jul 2023 14:15:23 +0000 (15:15 +0100)]
Update to rails 7.0.6

17 months agoMerge remote-tracking branch 'upstream/pull/4074'
Tom Hughes [Sat, 1 Jul 2023 14:21:27 +0000 (15:21 +0100)]
Merge remote-tracking branch 'upstream/pull/4074'

17 months agoFix confirmation prompt when granting or revoking roles
Tom Hughes [Sat, 1 Jul 2023 14:12:38 +0000 (15:12 +0100)]
Fix confirmation prompt when granting or revoking roles

17 months agoBump eslint from 8.43.0 to 8.44.0
dependabot[bot] [Fri, 30 Jun 2023 23:49:45 +0000 (23:49 +0000)]
Bump eslint from 8.43.0 to 8.44.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.43.0 to 8.44.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.43.0...v8.44.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 29 Jun 2023 11:18:30 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.

17 months agoFix new rubocop warnings
Tom Hughes [Tue, 27 Jun 2023 17:13:33 +0000 (18:13 +0100)]
Fix new rubocop warnings

17 months agoUpdate bundle
Tom Hughes [Tue, 27 Jun 2023 17:09:50 +0000 (18:09 +0100)]
Update bundle

17 months agoUpdate to rails 7.0.5.1
Tom Hughes [Tue, 27 Jun 2023 17:09:08 +0000 (18:09 +0100)]
Update to rails 7.0.5.1

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 26 Jun 2023 11:18:51 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Jun 2023 11:23:29 +0000 (13:23 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoUpdate bundle
Tom Hughes [Wed, 21 Jun 2023 19:26:26 +0000 (20:26 +0100)]
Update bundle

18 months agoMerge remote-tracking branch 'upstream/pull/4071'
Tom Hughes [Wed, 21 Jun 2023 19:25:08 +0000 (20:25 +0100)]
Merge remote-tracking branch 'upstream/pull/4071'

18 months agoBump osm-community-index from 5.5.2 to 5.5.3
dependabot[bot] [Tue, 20 Jun 2023 23:56:36 +0000 (23:56 +0000)]
Bump osm-community-index from 5.5.2 to 5.5.3

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.2 to 5.5.3.
- [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.2...v5.5.3)

---
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>
18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Jun 2023 11:12:39 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoMerge remote-tracking branch 'upstream/pull/4068'
Tom Hughes [Sun, 18 Jun 2023 17:40:48 +0000 (18:40 +0100)]
Merge remote-tracking branch 'upstream/pull/4068'

18 months agoBump eslint from 8.42.0 to 8.43.0
dependabot[bot] [Fri, 16 Jun 2023 23:56:46 +0000 (23:56 +0000)]
Bump eslint from 8.42.0 to 8.43.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.42.0 to 8.43.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.42.0...v8.43.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Jun 2023 11:32:36 +0000 (13:32 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoMerge remote-tracking branch 'upstream/pull/3975'
Tom Hughes [Wed, 14 Jun 2023 16:41:30 +0000 (17:41 +0100)]
Merge remote-tracking branch 'upstream/pull/3975'

18 months agoMerge remote-tracking branch 'upstream/pull/4063'
Tom Hughes [Wed, 14 Jun 2023 16:08:59 +0000 (17:08 +0100)]
Merge remote-tracking branch 'upstream/pull/4063'

18 months agoUse Time.utc for consistency with other tests
Andy Allan [Wed, 14 Jun 2023 15:44:13 +0000 (16:44 +0100)]
Use Time.utc for consistency with other tests

This also allows times to be created in short form, e.g. Time.utc(2020)

18 months agoFix test to work in non-UK timezones
Andy Allan [Wed, 14 Jun 2023 15:29:26 +0000 (16:29 +0100)]
Fix test to work in non-UK timezones

Time.new(...).utc is not the same as Time.utc(...). The
first creates a given date in local time, and then converts that to
utc, whereas the second creates the given time in UTC.

18 months agoMerge pull request #3907 from Dimitar5555/patch-1
Andy Allan [Wed, 14 Jun 2023 13:08:38 +0000 (14:08 +0100)]
Merge pull request #3907 from Dimitar5555/patch-1

Facelift `offline.html` and use Bootstrap classes for "notifications" under the search bar

18 months agoMerge pull request #4061 from stalker314314/master
Andy Allan [Wed, 14 Jun 2023 09:02:05 +0000 (10:02 +0100)]
Merge pull request #4061 from stalker314314/master

rerun script/misc/update-wiki-pages

18 months agoUpdate bundle
Tom Hughes [Tue, 13 Jun 2023 17:04:58 +0000 (18:04 +0100)]
Update bundle

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Jun 2023 11:23:57 +0000 (13:23 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoMerge pull request #4062 from stalker314314/fix-erb-lint-copyright
Andy Allan [Mon, 12 Jun 2023 09:02:29 +0000 (10:02 +0100)]
Merge pull request #4062 from stalker314314/fix-erb-lint-copyright

Fix ERB Lint for copyright page

18 months agoFix ERB Lint for copyright
Branko Kokanovic [Mon, 12 Jun 2023 08:40:45 +0000 (10:40 +0200)]
Fix ERB Lint for copyright

18 months agoupdate wiki pages
Branko Kokanovic [Mon, 12 Jun 2023 06:51:07 +0000 (08:51 +0200)]
update wiki pages

18 months agoMerge remote-tracking branch 'upstream/pull/3959'
Tom Hughes [Sun, 11 Jun 2023 17:34:01 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/3959'

18 months agoMerge remote-tracking branch 'upstream/pull/4060'
Tom Hughes [Sun, 11 Jun 2023 17:33:18 +0000 (18:33 +0100)]
Merge remote-tracking branch 'upstream/pull/4060'

18 months agoAdding information about Serbia sources
Branko Kokanovic [Tue, 7 Mar 2023 22:10:12 +0000 (23:10 +0100)]
Adding information about Serbia sources

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Jun 2023 11:12:39 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoBump coverallsapp/github-action from 2.1.2 to 2.2.0
dependabot[bot] [Wed, 7 Jun 2023 23:57:20 +0000 (23:57 +0000)]
Bump coverallsapp/github-action from 2.1.2 to 2.2.0

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.1.2 to 2.2.0.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.1.2...v2.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
18 months agoFix new rubocop warnings
Tom Hughes [Tue, 6 Jun 2023 17:45:38 +0000 (18:45 +0100)]
Fix new rubocop warnings

18 months agoUpdate bundle
Tom Hughes [Tue, 6 Jun 2023 17:40:21 +0000 (18:40 +0100)]
Update bundle

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 5 Jun 2023 11:12:32 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoMerge remote-tracking branch 'upstream/pull/4058'
Tom Hughes [Sat, 3 Jun 2023 10:15:51 +0000 (11:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4058'

18 months agoMerge remote-tracking branch 'upstream/pull/4057'
Tom Hughes [Sat, 3 Jun 2023 10:15:48 +0000 (11:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4057'

18 months agoClarify that symlinks refers to git not the operating system
Simon Poole [Sat, 3 Jun 2023 07:35:21 +0000 (09:35 +0200)]
Clarify that symlinks refers to git not the operating system

18 months agoBump eslint from 8.41.0 to 8.42.0
dependabot[bot] [Fri, 2 Jun 2023 23:56:34 +0000 (23:56 +0000)]
Bump eslint from 8.41.0 to 8.42.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.41.0 to 8.42.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.41.0...v8.42.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 1 Jun 2023 11:17:40 +0000 (13:17 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoMerge remote-tracking branch 'upstream/pull/4055'
Tom Hughes [Wed, 31 May 2023 17:40:07 +0000 (18:40 +0100)]
Merge remote-tracking branch 'upstream/pull/4055'

18 months agoMerge remote-tracking branch 'upstream/pull/4054'
Tom Hughes [Wed, 31 May 2023 17:38:33 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/4054'

18 months agoMerge remote-tracking branch 'upstream/pull/4053'
Tom Hughes [Wed, 31 May 2023 17:38:10 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/4053'

18 months agoMerge remote-tracking branch 'upstream/pull/4052'
Tom Hughes [Wed, 31 May 2023 17:37:23 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4052'

18 months agoMerge remote-tracking branch 'upstream/pull/4051'
Tom Hughes [Wed, 31 May 2023 17:37:01 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4051'

18 months agoMerge remote-tracking branch 'upstream/pull/4050'
Tom Hughes [Wed, 31 May 2023 17:35:38 +0000 (18:35 +0100)]
Merge remote-tracking branch 'upstream/pull/4050'

18 months agoSimplify ruby installations
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.

18 months agoSilence image_optim warnings in development
Andy Allan [Wed, 31 May 2023 16:39:54 +0000 (17:39 +0100)]
Silence image_optim warnings in development

Lots of new developers see this during configuration (e.g. rails
db:migrate) and then spend time trying to fix them. So let's avoid
the warnings entirely.

18 months agoIgnore .bundle/config
Andy Allan [Wed, 31 May 2023 16:36:53 +0000 (17:36 +0100)]
Ignore .bundle/config

This can be created by passing flags to bundler, such as the ones
used in our vagrant provisioning

18 months agoUse the db:create command for vagrant provisioning
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

18 months agoUse default version of node, but use npm to install yarn
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

18 months agoUpdate vagrant provisioning for 22.04
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

18 months agoUpdate workflows to run on Ubuntu 22.04
Andy Allan [Wed, 31 May 2023 11:07:47 +0000 (12:07 +0100)]
Update workflows to run on Ubuntu 22.04

18 months agoNormalise timestamp types for database structure comparison
Tom Hughes [Tue, 30 May 2023 17:57:09 +0000 (18:57 +0100)]
Normalise timestamp types for database structure comparison

18 months agoUpdate bundle
Tom Hughes [Tue, 30 May 2023 17:29:32 +0000 (18:29 +0100)]
Update bundle

18 months agoUpdate to rails 7.0.5
Tom Hughes [Tue, 30 May 2023 17:20:03 +0000 (18:20 +0100)]
Update to rails 7.0.5

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 29 May 2023 11:13:21 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 May 2023 11:15:48 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoLimit coveralls to reading lcov output
Tom Hughes [Wed, 24 May 2023 16:55:29 +0000 (17:55 +0100)]
Limit coveralls to reading lcov output

Fixes #4043

19 months agoUpdate bundle
Tom Hughes [Tue, 23 May 2023 17:18:37 +0000 (18:18 +0100)]
Update bundle

19 months agoGet docker working on Ubuntu 22.04
Tom Hughes [Mon, 22 May 2023 17:06:46 +0000 (18:06 +0100)]
Get docker working on Ubuntu 22.04

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 May 2023 11:12:41 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoMerge remote-tracking branch 'upstream/pull/4037'
Tom Hughes [Sun, 21 May 2023 17:32:23 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/4037'

19 months agoMerge remote-tracking branch 'upstream/pull/4035'
Tom Hughes [Sun, 21 May 2023 17:32:19 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/4035'

19 months agoBump eslint from 8.40.0 to 8.41.0
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>
19 months agoBump leaflet from 1.9.3 to 1.9.4
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>
19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 18 May 2023 11:15:30 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoUpdate minimum ruby version to 3.0
Tom Hughes [Tue, 16 May 2023 17:57:48 +0000 (18:57 +0100)]
Update minimum ruby version to 3.0

19 months agoAdd rubocop-factory_bot and fix warnings
Tom Hughes [Tue, 16 May 2023 17:44:14 +0000 (18:44 +0100)]
Add rubocop-factory_bot and fix warnings

19 months agoUpdate bundle
Tom Hughes [Tue, 16 May 2023 17:23:53 +0000 (18:23 +0100)]
Update bundle

19 months agoMerge remote-tracking branch 'upstream/pull/4034'
Tom Hughes [Tue, 16 May 2023 17:21:21 +0000 (18:21 +0100)]
Merge remote-tracking branch 'upstream/pull/4034'

19 months agoBump qs from 6.11.1 to 6.11.2
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>
19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 May 2023 11:12:28 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 11 May 2023 11:43:16 +0000 (13:43 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoUpdate bundle
Tom Hughes [Tue, 9 May 2023 09:40:24 +0000 (10:40 +0100)]
Update bundle

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 8 May 2023 11:22:46 +0000 (13:22 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoMerge remote-tracking branch 'upstream/pull/4029'
Tom Hughes [Sun, 7 May 2023 17:36:15 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4029'

19 months agoBump eslint from 8.39.0 to 8.40.0
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>
19 months agoUpdate bundle
Tom Hughes [Tue, 2 May 2023 17:11:26 +0000 (18:11 +0100)]
Update bundle

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 1 May 2023 11:15:49 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoMerge remote-tracking branch 'upstream/pull/4013'
Tom Hughes [Sun, 30 Apr 2023 17:43:51 +0000 (18:43 +0100)]
Merge remote-tracking branch 'upstream/pull/4013'

19 months agoMerge remote-tracking branch 'upstream/pull/4026'
Tom Hughes [Sun, 30 Apr 2023 17:32:23 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/4026'

19 months agoBump osm-community-index from 5.5.1 to 5.5.2
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>
19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 27 Apr 2023 11:16:31 +0000 (13:16 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoMerge remote-tracking branch 'upstream/pull/4024'
Tom Hughes [Wed, 26 Apr 2023 19:13:00 +0000 (20:13 +0100)]
Merge remote-tracking branch 'upstream/pull/4024'

20 months agoUpdate to iD v2.25.2
Martin Raifer [Wed, 26 Apr 2023 17:57:56 +0000 (19:57 +0200)]
Update to iD v2.25.2

20 months agoMerge remote-tracking branch 'upstream/pull/4023'
Tom Hughes [Wed, 26 Apr 2023 17:19:52 +0000 (18:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4023'

20 months agoMerge remote-tracking branch 'upstream/pull/4021'
Tom Hughes [Wed, 26 Apr 2023 17:19:30 +0000 (18:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4021'

20 months agoUse rails to migrate database for vagrant
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.

20 months agoRemove apache packages from install instructions and vagrant provisioning
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.