Commit graph

11716 commits

Author SHA1 Message Date
Harry Wood
fcbccb6a44 Report verification render not redirect
Fix an issue with the report verification, causing it to lose the text of a report if the user fails to fill in a category.

By using a `render` instead of a `redirect_to`, the rails standard verification behaviour works better. It means we also get a nice red "can't be blank" message highlighting the specific missing field.
2022-05-04 19:42:36 +01:00
Tom Hughes
fa77b55bd5 Merge remote-tracking branch 'upstream/pull/3539' 2022-05-03 19:09:31 +01:00
Tom Hughes
fc2af47f17 Update bundle 2022-05-03 18:10:02 +01:00
translatewiki.net
318229079d Localisation updates from https://translatewiki.net. 2022-05-02 13:11:33 +02:00
Harry Wood
b9659cdfc5 Add kramdown info box with preview button 2022-04-29 01:33:18 +01:00
Harry Wood
9401e451d1 Format report text with kramdown
Pass the text of reports ('details' field) through the RichText formatter to give us kramdown formatting support.
2022-04-29 01:31:39 +01:00
Harry Wood
db16445fc0 Add test of individual issue view with report
Add a test covering viewing an individual issue, a view which includes text of a report.
2022-04-29 01:29:44 +01:00
translatewiki.net
b3797384b7 Localisation updates from https://translatewiki.net. 2022-04-28 13:12:54 +02:00
Andy Allan
082880fca6
Merge pull request #3536 from JesseWeinstein/dittaeva_ancient_patch
Meaningful and disambiguating class/type labels (from 2012)
2022-04-27 16:29:54 +01:00
Andy Allan
50f658142b Merge commit '73f0be9647'
Closes #3512
2022-04-27 16:12:52 +01:00
Jesse Weinstein
91ba00c03e Apply the 4 suggestions from @gravitystorm 2022-04-27 10:14:26 -04:00
Tom Hughes
f6a1700ef6 Merge remote-tracking branch 'upstream/pull/3537' 2022-04-27 12:06:41 +01:00
Andy Allan
0348ceb3d7 Rework common details to avoid awkward line breaks
Fixes #3435

Also brings the location information into the list, which avoids a
lack of padding before the next header.
2022-04-27 11:47:42 +01:00
Tom Hughes
10200605ee Update to rails 7.0.2.4 2022-04-26 22:59:54 +01:00
Tom Hughes
0724ed1aeb Fix new rubocopy warnings 2022-04-26 18:10:52 +01:00
Tom Hughes
5e0badd215 Update bundle 2022-04-26 18:08:39 +01:00
translatewiki.net
4bf0316e67 Localisation updates from https://translatewiki.net. 2022-04-25 13:13:22 +02:00
Jesse Weinstein
550c4a3a45 Merge branch 'master' into HEAD 2022-04-24 22:12:58 -04:00
Tom Hughes
e66253afbe Merge remote-tracking branch 'upstream/pull/3534' 2022-04-23 00:05:41 +01:00
dependabot[bot]
eb5ee53ff8
Bump eslint from 8.13.0 to 8.14.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.13.0 to 8.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/v8.13.0...v8.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>
2022-04-22 23:01:01 +00:00
Tom Hughes
56e7b269a0 Cancel workflow runs which get superseded automatically 2022-04-21 12:25:59 +01:00
translatewiki.net
32419b41f9 Localisation updates from https://translatewiki.net. 2022-04-21 13:12:18 +02:00
Tom Hughes
877867537b Fix eslint warning 2022-04-18 14:23:02 +01:00
Tom Hughes
0295b05bdf Update bundle 2022-04-18 14:13:52 +01:00
Tom Hughes
2f6eebcd97 Update to leaflet 1.8.0 2022-04-18 14:10:06 +01:00
translatewiki.net
0676bea453 Localisation updates from https://translatewiki.net. 2022-04-18 13:11:49 +02:00
translatewiki.net
675279d17e Localisation updates from https://translatewiki.net. 2022-04-14 13:12:39 +02:00
Tom Hughes
9c0582f88f Merge remote-tracking branch 'upstream/pull/3523' 2022-04-12 17:12:16 +01:00
Tom Hughes
62968b980f Update bundle 2022-04-12 16:59:13 +01:00
Tom Hughes
7f619c6484 Check API status before authorizing access
Fixes #3530
2022-04-11 20:47:52 +01:00
Tom Hughes
6ef6ddc14d Make database_offline mode work
Fixes #3529
2022-04-11 20:28:11 +01:00
translatewiki.net
586386ba5b Localisation updates from https://translatewiki.net. 2022-04-11 13:12:35 +02:00
Tom Hughes
58c1073152 Merge remote-tracking branch 'upstream/pull/3526' 2022-04-09 23:29:19 +01:00
hlfan
73f0be9647
variant B
Reducing regex complexity and broadening the domain match
2022-04-09 22:28:01 +02:00
dependabot[bot]
df448f7504
Bump eslint from 8.12.0 to 8.13.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.12.0 to 8.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/v8.12.0...v8.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>
2022-04-08 23:00:43 +00:00
translatewiki.net
887caff604 Localisation updates from https://translatewiki.net. 2022-04-07 13:11:20 +02:00
Andy Allan
387668a4c6
Merge pull request #3495 from mmd-osm/patch/json_cs
JSON output added to changeset(s) endpoints
2022-04-06 18:04:17 +01:00
Andy Allan
561ee71129 Rubocop autofix: ambiguous operator precedence
This simply adds braces to clarify which mathematical operator comes
first.
2022-04-06 14:55:29 +01:00
Tom Hughes
e103620ff4 Update bundle 2022-04-04 18:14:07 +01:00
translatewiki.net
92246a186f Localisation updates from https://translatewiki.net. 2022-04-04 13:11:36 +02:00
translatewiki.net
e475d968db Localisation updates from https://translatewiki.net. 2022-03-31 13:12:25 +02:00
Tom Hughes
b45635dbdc Merge remote-tracking branch 'upstream/pull/3520' 2022-03-30 23:59:40 +01:00
dependabot[bot]
a39e3e810f
Bump puma from 5.6.2 to 5.6.4
Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4.
- [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.2...v5.6.4)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-30 22:17:25 +00:00
Tom Hughes
f2656f925e Uniqify counts for containing ways and relations on browse pages
Fixes #3519
2022-03-30 22:26:39 +01:00
Tom Hughes
8364fa6eb6 Merge remote-tracking branch 'upstream/pull/3518' 2022-03-30 18:00:00 +01:00
Andy Allan
5c2cb9e96f Use factories for tag uniqueness tests 2022-03-30 17:15:11 +01:00
Andy Allan
034db6820f Simplify changeset tag tests by using factories
This saves lots of boilerplate in creating a valid test object
2022-03-30 17:03:04 +01:00
Andy Allan
374518f58a Rework 'empty' tag tests
These tests were checking that the parent object was set, but this
was not obvious from the way that the tests were named and constructed.

This refactoring makes it clearer what is being checked.
2022-03-30 16:37:16 +01:00
Andy Allan
f0bcc60682
Merge pull request #3516 from danieldegroot2/wiki
Add initial capital letter
2022-03-30 16:25:48 +01:00
Tom Hughes
fd30a24029 Update bundle 2022-03-29 17:54:23 +01:00