]> git.openstreetmap.org Git - rails.git/log
rails.git
2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 13 Jun 2022 11:16:18 +0000 (13:16 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3568'
Tom Hughes [Fri, 10 Jun 2022 15:46:24 +0000 (16:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3568'

2 years agoMargins for 'comment from' / 'reported by' lines on issues page
Anton Khorev [Fri, 10 Jun 2022 14:22:15 +0000 (17:22 +0300)]
Margins for 'comment from' / 'reported by' lines on issues page

2 years agoAdd validation for relation member roles
Tom Hughes [Thu, 9 Jun 2022 18:11:59 +0000 (19:11 +0100)]
Add validation for relation member roles

Fixes #3563

2 years agoMerge remote-tracking branch 'upstream/pull/3566'
Tom Hughes [Thu, 9 Jun 2022 18:20:49 +0000 (19:20 +0100)]
Merge remote-tracking branch 'upstream/pull/3566'

2 years agoWrap issue comment rich text in div
Anton Khorev [Thu, 9 Jun 2022 13:37:20 +0000 (16:37 +0300)]
Wrap issue comment rich text in div

2 years agoWrap issue report rich text in div
Anton Khorev [Thu, 9 Jun 2022 00:46:12 +0000 (03:46 +0300)]
Wrap issue report rich text in div

2 years agoMerge remote-tracking branch 'upstream/pull/3565'
Tom Hughes [Thu, 9 Jun 2022 18:18:53 +0000 (19:18 +0100)]
Merge remote-tracking branch 'upstream/pull/3565'

2 years agoUpdate copyright notice
Dermot McNally [Thu, 12 May 2022 15:19:42 +0000 (16:19 +0100)]
Update copyright notice

Updated in accordance with LWG decision to better reflect updated
guidance, including providing a link to the Attribution Guidelines.

Closes #3565

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 Jun 2022 11:15:14 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3564'
Tom Hughes [Wed, 8 Jun 2022 12:29:21 +0000 (13:29 +0100)]
Merge remote-tracking branch 'upstream/pull/3564'

2 years agoRename id_oauth_application to id_application in settings
Tom Hughes [Wed, 8 Jun 2022 12:28:07 +0000 (13:28 +0100)]
Rename id_oauth_application to id_application in settings

2 years agoBump qs from 6.10.3 to 6.10.5
dependabot[bot] [Mon, 6 Jun 2022 23:00:42 +0000 (23:00 +0000)]
Bump qs from 6.10.3 to 6.10.5

Bumps [qs](https://github.com/ljharb/qs) from 6.10.3 to 6.10.5.
- [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.10.3...v6.10.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoMerge remote-tracking branch 'upstream/pull/3561'
Tom Hughes [Mon, 6 Jun 2022 17:32:43 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3561'

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Jun 2022 11:16:18 +0000 (13:16 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate bundle
Tom Hughes [Sun, 5 Jun 2022 18:47:56 +0000 (19:47 +0100)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3557'
Tom Hughes [Sun, 5 Jun 2022 18:44:55 +0000 (19:44 +0100)]
Merge remote-tracking branch 'upstream/pull/3557'

2 years agoMerge remote-tracking branch 'upstream/pull/3562'
Tom Hughes [Sun, 5 Jun 2022 18:44:04 +0000 (19:44 +0100)]
Merge remote-tracking branch 'upstream/pull/3562'

2 years agoBump eslint from 8.16.0 to 8.17.0
dependabot[bot] [Fri, 3 Jun 2022 23:00:53 +0000 (23:00 +0000)]
Bump eslint from 8.16.0 to 8.17.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.16.0 to 8.17.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.16.0...v8.17.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoUpdate to iD v2.21.0
Martin Raifer [Fri, 3 Jun 2022 13:14:53 +0000 (15:14 +0200)]
Update to iD v2.21.0

major changes in this release:
* dropped support for Internet Explorer 11
* switched authentication to OAuth 2

for further changes please refer to https://github.com/openstreetmap/iD/blob/release/CHANGELOG.md#2210

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Jun 2022 11:14:47 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoFix highway crossing in nominatim description terms
Sarah Hoffmann [Mon, 30 May 2022 12:57:28 +0000 (14:57 +0200)]
Fix highway crossing in nominatim description terms

The entry is syntactically wrong. The description terms expect a list of values for each key.

Given that 'crossing' is not a main tag, the key shouldn't be featured in the list at all. I've added highway=crossing instead.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 30 May 2022 11:13:17 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate bundle
Tom Hughes [Sun, 29 May 2022 09:57:39 +0000 (10:57 +0100)]
Update bundle

2 years agoSet a timeout on HTTP requests made by the server
Tom Hughes [Sun, 29 May 2022 09:54:39 +0000 (10:54 +0100)]
Set a timeout on HTTP requests made by the server

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 May 2022 11:14:22 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate bundle
Tom Hughes [Wed, 25 May 2022 17:02:58 +0000 (18:02 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 May 2022 11:13:26 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3554'
Tom Hughes [Sun, 22 May 2022 17:32:22 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3554'

2 years agoMerge remote-tracking branch 'upstream/pull/3556'
Tom Hughes [Sun, 22 May 2022 17:31:39 +0000 (18:31 +0100)]
Merge remote-tracking branch 'upstream/pull/3556'

2 years agoBump eslint from 8.15.0 to 8.16.0
dependabot[bot] [Fri, 20 May 2022 23:00:43 +0000 (23:00 +0000)]
Bump eslint from 8.15.0 to 8.16.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.15.0 to 8.16.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.15.0...v8.16.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoDrop AOL and Wordpress login links
Tom Hughes [Fri, 20 May 2022 17:23:51 +0000 (18:23 +0100)]
Drop AOL and Wordpress login links

Fixes #3555

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 May 2022 11:25:56 +0000 (13:25 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoAdd "garden" to map key
Frederik Ramm [Wed, 18 May 2022 13:46:24 +0000 (15:46 +0200)]
Add "garden" to map key

Make map key list "common, meadow, garden" instead of just "common, meadow".

This is in response to a DWG ticket ( #2022051810000111) where a resident complained that their private garden was "listed as 'common, meadow' " in OSM because they consulted the map key. Listing "garden" along these should clear up that misunderstanding.

2 years agoFix new rubocop warnings
Tom Hughes [Mon, 16 May 2022 18:16:53 +0000 (19:16 +0100)]
Fix new rubocop warnings

2 years agoUpdate bundle
Tom Hughes [Mon, 16 May 2022 18:14:05 +0000 (19:14 +0100)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3549'
Tom Hughes [Mon, 16 May 2022 18:13:28 +0000 (19:13 +0100)]
Merge remote-tracking branch 'upstream/pull/3549'

2 years agoMerge remote-tracking branch 'upstream/pull/3548'
Tom Hughes [Mon, 16 May 2022 18:08:16 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/3548'

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 May 2022 11:12:36 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoBump leaflet.locatecontrol from 0.76.0 to 0.76.1
dependabot[bot] [Thu, 12 May 2022 23:00:45 +0000 (23:00 +0000)]
Bump leaflet.locatecontrol from 0.76.0 to 0.76.1

Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.76.0 to 0.76.1.
- [Release notes](https://github.com/domoritz/leaflet-locatecontrol/releases)
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.76.0...v0.76.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 May 2022 11:12:49 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUse a secondary-actions nav for issue actions
Andy Allan [Wed, 11 May 2022 15:08:48 +0000 (16:08 +0100)]
Use a secondary-actions nav for issue actions

This fits with actions on other pages, avoids using pipe characters,
and resolves an issue with empty paragraphs.

2 years agoTeach database structure normalise to ignore btree_gist comment
Tom Hughes [Mon, 9 May 2022 17:39:14 +0000 (18:39 +0100)]
Teach database structure normalise to ignore btree_gist comment

2 years agoUpdate to rails 7.0.3
Tom Hughes [Mon, 9 May 2022 17:11:44 +0000 (18:11 +0100)]
Update to rails 7.0.3

2 years agoUpdate bundle
Tom Hughes [Mon, 9 May 2022 17:10:40 +0000 (18:10 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 May 2022 11:12:15 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3543'
Tom Hughes [Sat, 7 May 2022 07:19:19 +0000 (08:19 +0100)]
Merge remote-tracking branch 'upstream/pull/3543'

2 years agoMerge remote-tracking branch 'upstream/pull/3544'
Tom Hughes [Sat, 7 May 2022 07:16:12 +0000 (08:16 +0100)]
Merge remote-tracking branch 'upstream/pull/3544'

2 years agoDisable some Style/RedundantCondition corrections temporarily
Tom Hughes [Sat, 7 May 2022 07:14:56 +0000 (08:14 +0100)]
Disable some Style/RedundantCondition corrections temporarily

https://github.com/rubocop/rubocop/issues/10605

2 years agoUpdate bundle
Tom Hughes [Fri, 6 May 2022 23:33:04 +0000 (00:33 +0100)]
Update bundle

2 years agoBump eslint from 8.14.0 to 8.15.0
dependabot[bot] [Fri, 6 May 2022 23:01:09 +0000 (23:01 +0000)]
Bump eslint from 8.14.0 to 8.15.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.14.0 to 8.15.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.14.0...v8.15.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoPut issue comments through kramdown formatter
Harry Wood [Fri, 6 May 2022 11:41:04 +0000 (12:41 +0100)]
Put issue comments through kramdown formatter

On issue comments (which only admins can create or see), put the `body` text through kramdown formatting.

2 years agoAdd some basic testing of issue_comment model
Harry Wood [Fri, 6 May 2022 11:38:17 +0000 (12:38 +0100)]
Add some basic testing of issue_comment model

A factory and a basic test of validation for the issue_comment model, similar to what we have for diary_comment.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 May 2022 11:12:22 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3542'
Tom Hughes [Wed, 4 May 2022 19:27:20 +0000 (20:27 +0100)]
Merge remote-tracking branch 'upstream/pull/3542'

2 years agoReport verification render not redirect
Harry Wood [Wed, 4 May 2022 15:34:40 +0000 (16:34 +0100)]
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.

2 years agoMerge remote-tracking branch 'upstream/pull/3539'
Tom Hughes [Tue, 3 May 2022 18:09:31 +0000 (19:09 +0100)]
Merge remote-tracking branch 'upstream/pull/3539'

2 years agoUpdate bundle
Tom Hughes [Tue, 3 May 2022 17:10:02 +0000 (18:10 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 2 May 2022 11:11:33 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoAdd kramdown info box with preview button
Harry Wood [Thu, 28 Apr 2022 23:52:21 +0000 (00:52 +0100)]
Add kramdown info box with preview button

2 years agoFormat report text with kramdown
Harry Wood [Thu, 28 Apr 2022 22:05:36 +0000 (23:05 +0100)]
Format report text with kramdown

Pass the text of reports ('details' field) through the RichText formatter to give us kramdown formatting support.

2 years agoAdd test of individual issue view with report
Harry Wood [Thu, 28 Apr 2022 21:32:44 +0000 (22:32 +0100)]
Add test of individual issue view with report

Add a test covering viewing an individual issue, a view which includes text of a report.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 28 Apr 2022 11:12:54 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge pull request #3536 from JesseWeinstein/dittaeva_ancient_patch
Andy Allan [Wed, 27 Apr 2022 15:29:54 +0000 (16:29 +0100)]
Merge pull request #3536 from JesseWeinstein/dittaeva_ancient_patch

Meaningful and disambiguating class/type labels (from 2012)

2 years agoMerge commit '73f0be96472a8d021a6347953192ca7b6ec509d7'
Andy Allan [Wed, 27 Apr 2022 15:10:46 +0000 (16:10 +0100)]
Merge commit '73f0be96472a8d021a6347953192ca7b6ec509d7'

Closes #3512

2 years agoApply the 4 suggestions from @gravitystorm
Jesse Weinstein [Wed, 27 Apr 2022 14:14:26 +0000 (10:14 -0400)]
Apply the 4 suggestions from @gravitystorm

2 years agoMerge remote-tracking branch 'upstream/pull/3537'
Tom Hughes [Wed, 27 Apr 2022 11:06:41 +0000 (12:06 +0100)]
Merge remote-tracking branch 'upstream/pull/3537'

2 years agoRework common details to avoid awkward line breaks
Andy Allan [Wed, 27 Apr 2022 10:47:42 +0000 (11:47 +0100)]
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.

2 years agoUpdate to rails 7.0.2.4
Tom Hughes [Tue, 26 Apr 2022 21:59:54 +0000 (22:59 +0100)]
Update to rails 7.0.2.4

2 years agoFix new rubocopy warnings
Tom Hughes [Tue, 26 Apr 2022 17:10:52 +0000 (18:10 +0100)]
Fix new rubocopy warnings

2 years agoUpdate bundle
Tom Hughes [Tue, 26 Apr 2022 17:08:39 +0000 (18:08 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 Apr 2022 11:13:22 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge branch 'master' into HEAD
Jesse Weinstein [Mon, 25 Apr 2022 02:06:10 +0000 (22:06 -0400)]
Merge branch 'master' into HEAD

2 years agoMerge remote-tracking branch 'upstream/pull/3534'
Tom Hughes [Fri, 22 Apr 2022 23:05:41 +0000 (00:05 +0100)]
Merge remote-tracking branch 'upstream/pull/3534'

2 years agoBump eslint from 8.13.0 to 8.14.0
dependabot[bot] [Fri, 22 Apr 2022 23:01:01 +0000 (23:01 +0000)]
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>
2 years agoCancel workflow runs which get superseded automatically
Tom Hughes [Thu, 21 Apr 2022 11:25:59 +0000 (12:25 +0100)]
Cancel workflow runs which get superseded automatically

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 21 Apr 2022 11:12:18 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoFix eslint warning
Tom Hughes [Mon, 18 Apr 2022 13:23:02 +0000 (14:23 +0100)]
Fix eslint warning

2 years agoUpdate bundle
Tom Hughes [Mon, 18 Apr 2022 13:13:52 +0000 (14:13 +0100)]
Update bundle

2 years agoUpdate to leaflet 1.8.0
Tom Hughes [Mon, 18 Apr 2022 13:10:06 +0000 (14:10 +0100)]
Update to leaflet 1.8.0

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Apr 2022 11:11:49 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Apr 2022 11:12:39 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3523'
Tom Hughes [Tue, 12 Apr 2022 16:12:16 +0000 (17:12 +0100)]
Merge remote-tracking branch 'upstream/pull/3523'

2 years agoUpdate bundle
Tom Hughes [Tue, 12 Apr 2022 15:59:13 +0000 (16:59 +0100)]
Update bundle

2 years agoCheck API status before authorizing access
Tom Hughes [Mon, 11 Apr 2022 19:47:52 +0000 (20:47 +0100)]
Check API status before authorizing access

Fixes #3530

2 years agoMake database_offline mode work
Tom Hughes [Mon, 11 Apr 2022 19:28:11 +0000 (20:28 +0100)]
Make database_offline mode work

Fixes #3529

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 11 Apr 2022 11:12:35 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3526'
Tom Hughes [Sat, 9 Apr 2022 22:29:19 +0000 (23:29 +0100)]
Merge remote-tracking branch 'upstream/pull/3526'

2 years agovariant B
hlfan [Sat, 9 Apr 2022 20:28:01 +0000 (22:28 +0200)]
variant B

Reducing regex complexity and broadening the domain match

2 years agoBump eslint from 8.12.0 to 8.13.0
dependabot[bot] [Fri, 8 Apr 2022 23:00:43 +0000 (23:00 +0000)]
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>
2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 7 Apr 2022 11:11:20 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge pull request #3495 from mmd-osm/patch/json_cs
Andy Allan [Wed, 6 Apr 2022 17:04:17 +0000 (18:04 +0100)]
Merge pull request #3495 from mmd-osm/patch/json_cs

JSON output added to changeset(s) endpoints

2 years agoRubocop autofix: ambiguous operator precedence
Andy Allan [Wed, 6 Apr 2022 13:55:29 +0000 (14:55 +0100)]
Rubocop autofix: ambiguous operator precedence

This simply adds braces to clarify which mathematical operator comes
first.

2 years agoUpdate bundle
Tom Hughes [Mon, 4 Apr 2022 17:14:07 +0000 (18:14 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 4 Apr 2022 11:11:36 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 31 Mar 2022 11:12:25 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3520'
Tom Hughes [Wed, 30 Mar 2022 22:59:40 +0000 (23:59 +0100)]
Merge remote-tracking branch 'upstream/pull/3520'

2 years agoBump puma from 5.6.2 to 5.6.4
dependabot[bot] [Wed, 30 Mar 2022 22:17:25 +0000 (22:17 +0000)]
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>
2 years agoUniqify counts for containing ways and relations on browse pages
Tom Hughes [Wed, 30 Mar 2022 21:26:39 +0000 (22:26 +0100)]
Uniqify counts for containing ways and relations on browse pages

Fixes #3519

2 years agoMerge remote-tracking branch 'upstream/pull/3518'
Tom Hughes [Wed, 30 Mar 2022 17:00:00 +0000 (18:00 +0100)]
Merge remote-tracking branch 'upstream/pull/3518'