]> git.openstreetmap.org Git - rails.git/log
rails.git
13 months agoMerge remote-tracking branch 'upstream/pull/3960'
Tom Hughes [Wed, 8 Mar 2023 15:58:03 +0000 (15:58 +0000)]
Merge remote-tracking branch 'upstream/pull/3960'

13 months agoRemove unused user_blocks translations
Andy Allan [Wed, 8 Mar 2023 15:10:19 +0000 (15:10 +0000)]
Remove unused user_blocks translations

These checkboxes were removed in 95c3d640a44857b0b92ec3be6dad606e40057c5c

13 months agoRemove used issues#update translations
Andy Allan [Wed, 8 Mar 2023 15:03:57 +0000 (15:03 +0000)]
Remove used issues#update translations

These are covered by reports#create, and there is no issues#update
controller method or view.

13 months agoRemove used translations on the registration page
Andy Allan [Wed, 8 Mar 2023 14:53:34 +0000 (14:53 +0000)]
Remove used translations on the registration page

We use activerecord attributes for this instead

13 months agoRemove set_home translation
Andy Allan [Wed, 8 Mar 2023 14:51:13 +0000 (14:51 +0000)]
Remove set_home translation

The corresponding method was removed in 2010 with fbe529d87e61ab63bcf749067422ab2cbbb655d0

13 months agoRemove several unused translations from the user#show page
Andy Allan [Wed, 8 Mar 2023 14:46:12 +0000 (14:46 +0000)]
Remove several unused translations from the user#show page

13 months agoAdd rubocop-capybara
Tom Hughes [Tue, 7 Mar 2023 17:09:29 +0000 (17:09 +0000)]
Add rubocop-capybara

13 months agoUpdate bundle
Tom Hughes [Tue, 7 Mar 2023 17:02:18 +0000 (17:02 +0000)]
Update bundle

13 months agoMerge remote-tracking branch 'upstream/pull/3957'
Tom Hughes [Tue, 7 Mar 2023 17:01:22 +0000 (17:01 +0000)]
Merge remote-tracking branch 'upstream/pull/3957'

13 months agoBump qs from 6.11.0 to 6.11.1
dependabot[bot] [Mon, 6 Mar 2023 23:56:38 +0000 (23:56 +0000)]
Bump qs from 6.11.0 to 6.11.1

Bumps [qs](https://github.com/ljharb/qs) from 6.11.0 to 6.11.1.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.11.0...v6.11.1)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Mar 2023 12:14:43 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

13 months agoMerge remote-tracking branch 'upstream/pull/3955'
Tom Hughes [Fri, 3 Mar 2023 22:32:37 +0000 (22:32 +0000)]
Merge remote-tracking branch 'upstream/pull/3955'

13 months agoUpdate to iD v2.25.1
Martin Raifer [Fri, 3 Mar 2023 15:53:00 +0000 (16:53 +0100)]
Update to iD v2.25.1

14 months agoMerge remote-tracking branch 'upstream/pull/3953'
Tom Hughes [Fri, 3 Mar 2023 17:55:53 +0000 (17:55 +0000)]
Merge remote-tracking branch 'upstream/pull/3953'

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Mar 2023 12:17:49 +0000 (13:17 +0100)]
Localisation updates from https://translatewiki.net.

14 months agoBump coverallsapp/github-action from 1.2.2 to 1.2.4
dependabot[bot] [Wed, 1 Mar 2023 23:57:09 +0000 (23:57 +0000)]
Bump coverallsapp/github-action from 1.2.2 to 1.2.4

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.2.2 to 1.2.4.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v1.2.2...v1.2.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>
14 months agoFix new rubocop warnings
Tom Hughes [Tue, 28 Feb 2023 15:20:33 +0000 (15:20 +0000)]
Fix new rubocop warnings

14 months agoUpdate bundle
Tom Hughes [Tue, 28 Feb 2023 15:19:07 +0000 (15:19 +0000)]
Update bundle

14 months agoMerge remote-tracking branch 'upstream/pull/3950'
Tom Hughes [Tue, 28 Feb 2023 15:16:49 +0000 (15:16 +0000)]
Merge remote-tracking branch 'upstream/pull/3950'

14 months agoMerge remote-tracking branch 'upstream/pull/3949'
Tom Hughes [Tue, 28 Feb 2023 15:16:43 +0000 (15:16 +0000)]
Merge remote-tracking branch 'upstream/pull/3949'

14 months agoRemove duplicate translation key
Andy Allan [Tue, 28 Feb 2023 11:05:46 +0000 (11:05 +0000)]
Remove duplicate translation key

It's already defined three lines above.

14 months agoRemove old model name
Andy Allan [Tue, 28 Feb 2023 11:04:12 +0000 (11:04 +0000)]
Remove old model name

I doubt this was ever used, but anyway it was made redundant in
4395b79bf72f85543bce8ff3627eb7a0583b5ccc when the class was renamed.

14 months agoBump coverallsapp/github-action from 1.2.1 to 1.2.2
dependabot[bot] [Mon, 27 Feb 2023 23:57:10 +0000 (23:57 +0000)]
Bump coverallsapp/github-action from 1.2.1 to 1.2.2

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v1.2.1...v1.2.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>
14 months agoBump eslint from 8.34.0 to 8.35.0
dependabot[bot] [Mon, 27 Feb 2023 23:56:39 +0000 (23:56 +0000)]
Bump eslint from 8.34.0 to 8.35.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.34.0 to 8.35.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.34.0...v8.35.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
14 months agoRemove translations that are no longer used when showing messages
Andy Allan [Sun, 26 Feb 2023 14:27:05 +0000 (15:27 +0100)]
Remove translations that are no longer used when showing messages

14 months agoRemove used translations for new messages
Andy Allan [Sun, 26 Feb 2023 14:23:07 +0000 (15:23 +0100)]
Remove used translations for new messages

We use the activerecord attribute hierarchy for this

14 months agoRemove unused translations
Andy Allan [Sun, 26 Feb 2023 13:49:40 +0000 (14:49 +0100)]
Remove unused translations

These were removed in 6adcce4e5d75fa21dea85742fa3

14 months agoBump coverallsapp/github-action to 1.2.1
Tom Hughes [Mon, 27 Feb 2023 12:22:17 +0000 (12:22 +0000)]
Bump coverallsapp/github-action to 1.2.1

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 27 Feb 2023 12:12:47 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.

14 months agoMerge remote-tracking branch 'upstream/pull/3941'
Tom Hughes [Mon, 27 Feb 2023 12:07:42 +0000 (12:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3941'

14 months agoRemove unused tooltip translations
Andy Allan [Sun, 26 Feb 2023 10:22:32 +0000 (11:22 +0100)]
Remove unused tooltip translations

These were removed in 2d9a083b365e5cfa527c40add35464630c1a9b00

14 months agoRemove unused metro extract translations
Andy Allan [Sun, 26 Feb 2023 10:12:41 +0000 (11:12 +0100)]
Remove unused metro extract translations

Refs 9340c461732ef7387dd453ea3fcf5e64ea782ab4

14 months agoRemove translations no longer used on the login page
Andy Allan [Sat, 25 Feb 2023 17:36:42 +0000 (18:36 +0100)]
Remove translations no longer used on the login page

This page was refactored in 2a3bc0a38789b29b8798eafd80fc4fb77c5c7957

14 months agoBump coverallsapp/github-action from 1.1.3 to 1.2.0
dependabot[bot] [Fri, 24 Feb 2023 23:56:58 +0000 (23:56 +0000)]
Bump coverallsapp/github-action from 1.1.3 to 1.2.0

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.1.3 to 1.2.0.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/1.1.3...v1.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>
14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 23 Feb 2023 12:14:12 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

14 months agoMerge remote-tracking branch 'upstream/pull/3936'
Tom Hughes [Wed, 22 Feb 2023 18:17:51 +0000 (18:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3936'

14 months agoMerge pull request #3935 from Hufkratzer/rename-horse-riding-label
Andy Allan [Wed, 22 Feb 2023 15:26:20 +0000 (15:26 +0000)]
Merge pull request #3935 from Hufkratzer/rename-horse-riding-label

Change label for leisure=horse_riding in en.yml

14 months agoRework about page to avoid html in the translations
Andy Allan [Wed, 15 Feb 2023 16:47:21 +0000 (16:47 +0000)]
Rework about page to avoid html in the translations

14 months agoRemove html from translations for the welcome page
Andy Allan [Wed, 15 Feb 2023 16:47:02 +0000 (16:47 +0000)]
Remove html from translations for the welcome page

This also refactors the "any questions" section, which is shared with the fixthemap page.

14 months agoMerge remote-tracking branch 'upstream/pull/3937'
Tom Hughes [Wed, 22 Feb 2023 10:04:31 +0000 (10:04 +0000)]
Merge remote-tracking branch 'upstream/pull/3937'

14 months agoEnsure kramdown table alignment styles are converted to bootstrap classes
Andy Allan [Wed, 22 Feb 2023 09:46:48 +0000 (09:46 +0000)]
Ensure kramdown table alignment styles are converted to bootstrap classes

Adds tests for commit f42a7a2d8dd507a3746a1e2de91deda9614cf807

14 months agoRefactor trace guidance to avoid raw html in translations
Andy Allan [Wed, 8 Feb 2023 14:33:46 +0000 (14:33 +0000)]
Refactor trace guidance to avoid raw html in translations

Also rearrange to avoid multiple sentences in a heading.

14 months agoRefactor translation to avoid raw html tags
Andy Allan [Wed, 8 Feb 2023 14:11:45 +0000 (14:11 +0000)]
Refactor translation to avoid raw html tags

14 months agoMove public editing content into its own partial
Andy Allan [Wed, 8 Feb 2023 14:01:41 +0000 (14:01 +0000)]
Move public editing content into its own partial

This makes the editing page easier to read, and simplifies the i18n
in the public editing section.

14 months agoRefactor public editing note to avoid raw html in the translations
Andy Allan [Wed, 8 Feb 2023 13:55:33 +0000 (13:55 +0000)]
Refactor public editing note to avoid raw html in the translations

14 months agoUpdate bundle
Tom Hughes [Tue, 21 Feb 2023 18:09:58 +0000 (18:09 +0000)]
Update bundle

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 20 Feb 2023 12:14:01 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

14 months agoChange label for leisure=horse_riding in en.yml
Hufkratzer [Sat, 18 Feb 2023 21:16:19 +0000 (22:16 +0100)]
Change label for leisure=horse_riding in en.yml

Change "Horse Riding" to "Horse Riding Centre"

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 16 Feb 2023 12:14:07 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

14 months agoUpdate bundle
Tom Hughes [Tue, 14 Feb 2023 18:08:45 +0000 (18:08 +0000)]
Update bundle

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 13 Feb 2023 12:12:35 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.

14 months agoMerge remote-tracking branch 'upstream/pull/3930'
Tom Hughes [Sun, 12 Feb 2023 18:25:36 +0000 (18:25 +0000)]
Merge remote-tracking branch 'upstream/pull/3930'

14 months agoBump eslint from 8.33.0 to 8.34.0
dependabot[bot] [Fri, 10 Feb 2023 23:57:11 +0000 (23:57 +0000)]
Bump eslint from 8.33.0 to 8.34.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.33.0 to 8.34.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.33.0...v8.34.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
14 months agoMerge remote-tracking branch 'upstream/pull/3924'
Tom Hughes [Thu, 9 Feb 2023 17:48:55 +0000 (17:48 +0000)]
Merge remote-tracking branch 'upstream/pull/3924'

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 Feb 2023 12:13:40 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

14 months agoUpdate to iD v2.24.2
Martin Raifer [Thu, 9 Feb 2023 10:15:22 +0000 (11:15 +0100)]
Update to iD v2.24.2

14 months agoMerge pull request #3691 from AntonKhorev/wikipedia-secondary-links
Andy Allan [Wed, 8 Feb 2023 17:30:25 +0000 (17:30 +0000)]
Merge pull request #3691 from AntonKhorev/wikipedia-secondary-links

Link prefixed wikipedia tags

14 months agoUpdate bundle
Tom Hughes [Tue, 7 Feb 2023 18:22:50 +0000 (18:22 +0000)]
Update bundle

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Feb 2023 12:15:08 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Feb 2023 12:14:55 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

14 months agoMerge remote-tracking branch 'upstream/pull/3911'
Tom Hughes [Wed, 1 Feb 2023 19:10:22 +0000 (19:10 +0000)]
Merge remote-tracking branch 'upstream/pull/3911'

14 months agoMerge remote-tracking branch 'upstream/pull/3915'
Tom Hughes [Wed, 1 Feb 2023 19:07:09 +0000 (19:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3915'

14 months agoAvoid converting conditional restriction tags into emails
Andy Allan [Wed, 1 Feb 2023 18:57:16 +0000 (18:57 +0000)]
Avoid converting conditional restriction tags into emails

Fixes #3884

14 months agoRefactor to use submit_tag helper
Andy Allan [Wed, 1 Feb 2023 17:01:32 +0000 (17:01 +0000)]
Refactor to use submit_tag helper

This is more readable than interpolating into element attributes

14 months agoRefactor translation strings for notes
Andy Allan [Thu, 26 Jan 2023 11:36:09 +0000 (11:36 +0000)]
Refactor translation strings for notes

These aren't used by any javascript code, so don't need to be in
the `javascripts` key.

14 months agoUse data attributes to pass alternative button labels
Andy Allan [Wed, 1 Feb 2023 15:30:57 +0000 (15:30 +0000)]
Use data attributes to pass alternative button labels

This allows the text to be defined in the html partials, instead
of looking up the i18n via javascript.

14 months agoMove browse#note to notes#show
Andy Allan [Wed, 25 Jan 2023 21:46:35 +0000 (21:46 +0000)]
Move browse#note to notes#show

This allows a more resourceful routing approach.

14 months agoMove browse#new_note to notes#new
Andy Allan [Wed, 25 Jan 2023 19:22:10 +0000 (19:22 +0000)]
Move browse#new_note to notes#new

This allows a more resourceful routing approach.

15 months agoUpdate bundle
Tom Hughes [Tue, 31 Jan 2023 18:09:09 +0000 (18:09 +0000)]
Update bundle

15 months agoMerge remote-tracking branch 'upstream/pull/3913'
Tom Hughes [Tue, 31 Jan 2023 18:07:24 +0000 (18:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3913'

15 months agoBump eslint from 8.32.0 to 8.33.0
dependabot[bot] [Mon, 30 Jan 2023 23:00:40 +0000 (23:00 +0000)]
Bump eslint from 8.32.0 to 8.33.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.32.0 to 8.33.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.32.0...v8.33.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
15 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 30 Jan 2023 12:13:12 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

15 months agoUpdate to rails 7.0.4.2
Tom Hughes [Thu, 26 Jan 2023 18:06:57 +0000 (18:06 +0000)]
Update to rails 7.0.4.2

15 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 Jan 2023 12:17:10 +0000 (13:17 +0100)]
Localisation updates from https://translatewiki.net.

15 months agoSort issues in descending order of their last update
Tom Hughes [Thu, 26 Jan 2023 09:04:37 +0000 (09:04 +0000)]
Sort issues in descending order of their last update

15 months agoRename api_notes resource to avoid conflict with non-API resource
Andy Allan [Wed, 25 Jan 2023 19:01:57 +0000 (19:01 +0000)]
Rename api_notes resource to avoid conflict with non-API resource

This allows using e.g. note_path for notes#show in the future.

15 months agoMerge remote-tracking branch 'upstream/pull/3908'
Tom Hughes [Wed, 25 Jan 2023 12:15:41 +0000 (12:15 +0000)]
Merge remote-tracking branch 'upstream/pull/3908'

15 months agoUpdate to iD v2.24.1
Martin Raifer [Wed, 25 Jan 2023 11:59:54 +0000 (12:59 +0100)]
Update to iD v2.24.1

15 months agoMerge remote-tracking branch 'upstream/pull/3905'
Tom Hughes [Tue, 24 Jan 2023 18:28:27 +0000 (18:28 +0000)]
Merge remote-tracking branch 'upstream/pull/3905'

15 months agoFix new rubocop warnings
Tom Hughes [Tue, 24 Jan 2023 18:19:30 +0000 (18:19 +0000)]
Fix new rubocop warnings

15 months agoUpdate bundle
Tom Hughes [Tue, 24 Jan 2023 18:13:02 +0000 (18:13 +0000)]
Update bundle

15 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Jan 2023 12:13:19 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

15 months agoUpdate to iD v2.24.0
Martin Raifer [Thu, 19 Jan 2023 15:04:52 +0000 (16:04 +0100)]
Update to iD v2.24.0

15 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Jan 2023 12:16:50 +0000 (13:16 +0100)]
Localisation updates from https://translatewiki.net.

15 months agoUpdate to rails 7.0.4.1
Tom Hughes [Tue, 17 Jan 2023 19:29:30 +0000 (19:29 +0000)]
Update to rails 7.0.4.1

15 months agoMerge remote-tracking branch 'upstream/pull/3898'
Tom Hughes [Tue, 17 Jan 2023 18:38:03 +0000 (18:38 +0000)]
Merge remote-tracking branch 'upstream/pull/3898'

15 months agoUpdate bundle
Tom Hughes [Tue, 17 Jan 2023 18:37:43 +0000 (18:37 +0000)]
Update bundle

15 months agoBump eslint from 8.31.0 to 8.32.0
dependabot[bot] [Mon, 16 Jan 2023 23:00:52 +0000 (23:00 +0000)]
Bump eslint from 8.31.0 to 8.32.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.31.0 to 8.32.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.31.0...v8.32.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
15 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 Jan 2023 12:13:25 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

15 months agoUpdate tests for changes in osm-community-index
Tom Hughes [Sat, 14 Jan 2023 15:12:23 +0000 (15:12 +0000)]
Update tests for changes in osm-community-index

15 months agoMerge remote-tracking branch 'upstream/pull/3893'
Tom Hughes [Sat, 14 Jan 2023 14:49:18 +0000 (14:49 +0000)]
Merge remote-tracking branch 'upstream/pull/3893'

15 months agoBump osm-community-index from 5.4.0 to 5.5.0
dependabot[bot] [Fri, 13 Jan 2023 23:00:43 +0000 (23:00 +0000)]
Bump osm-community-index from 5.4.0 to 5.5.0

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.4.0 to 5.5.0.
- [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.4.0...v5.5.0)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
15 months agoDrop version constraint on mail and update bundle
Tom Hughes [Fri, 13 Jan 2023 09:29:04 +0000 (09:29 +0000)]
Drop version constraint on mail and update bundle

15 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Jan 2023 12:15:28 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

15 months agoMerge remote-tracking branch 'upstream/pull/3891'
Tom Hughes [Wed, 11 Jan 2023 18:42:16 +0000 (18:42 +0000)]
Merge remote-tracking branch 'upstream/pull/3891'

15 months agoMerge remote-tracking branch 'upstream/pull/3890'
Tom Hughes [Wed, 11 Jan 2023 15:38:36 +0000 (15:38 +0000)]
Merge remote-tracking branch 'upstream/pull/3890'

15 months agoMerge pull request #3878 from tomhughes/issues-offline
Andy Allan [Wed, 11 Jan 2023 15:36:40 +0000 (15:36 +0000)]
Merge pull request #3878 from tomhughes/issues-offline

Add database checks to issue and report controllers

15 months agoMove more api-related helper methods to ApiController
Andy Allan [Wed, 11 Jan 2023 15:28:59 +0000 (15:28 +0000)]
Move more api-related helper methods to ApiController

This prevents them from being inadvertently used in non-API controllers

15 months agoUse web_timeout for notes controller
Andy Allan [Wed, 11 Jan 2023 15:28:02 +0000 (15:28 +0000)]
Use web_timeout for notes controller

This controller doesn't handle any API methods, and so the api call
error handling isn't appropriate.

15 months agoUse bin/yarn consistently for installations
Andy Allan [Wed, 11 Jan 2023 11:26:35 +0000 (11:26 +0000)]
Use bin/yarn consistently for installations

Since rails 7, the `rails yarn:install` command no longer uses
bin/yarn and so a) doesn't detect yarn binaries named "yarnpkg"
(e.g. Ubuntu) and b) doesn't allow us to pass any flags to yarn,
(e.g. "--ignore-engines").

Since we want to avoid making the installation more difficult (by
e.g. installing yarn from other sources, or requiring particular
node versions) we can instead just use our existing bin/yarn script.

The reason Dockerfile did its own thing was to avoid pulling in
big chunks of rails, but bin/yarn is a standalone ruby script.

Fixes #3579