]> git.openstreetmap.org Git - rails.git/log
rails.git
3 years agoUpdate bundle
Tom Hughes [Tue, 19 Jan 2021 18:18:42 +0000 (18:18 +0000)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Jan 2021 15:56:27 +0000 (16:56 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3060'
Tom Hughes [Mon, 18 Jan 2021 08:02:24 +0000 (08:02 +0000)]
Merge remote-tracking branch 'upstream/pull/3060'

3 years agoBump eslint from 7.17.0 to 7.18.0
dependabot[bot] [Mon, 18 Jan 2021 05:01:25 +0000 (05:01 +0000)]
Bump eslint from 7.17.0 to 7.18.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.17.0 to 7.18.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.17.0...v7.18.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Jan 2021 15:27:17 +0000 (16:27 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3049'
Tom Hughes [Thu, 14 Jan 2021 11:11:00 +0000 (11:11 +0000)]
Merge remote-tracking branch 'upstream/pull/3049'

3 years agoMerge remote-tracking branch 'upstream/pull/3048'
Tom Hughes [Thu, 14 Jan 2021 10:52:10 +0000 (10:52 +0000)]
Merge remote-tracking branch 'upstream/pull/3048'

3 years agoRefactor user_blocks form to use bootstrap
Andy Allan [Wed, 13 Jan 2021 17:01:51 +0000 (17:01 +0000)]
Refactor user_blocks form to use bootstrap

Further refactoring could involve a virtual attribute for duration.

3 years agoBump qs from 6.9.4 to 6.9.6
dependabot[bot] [Thu, 14 Jan 2021 05:01:14 +0000 (05:01 +0000)]
Bump qs from 6.9.4 to 6.9.6

Bumps [qs](https://github.com/ljharb/qs) from 6.9.4 to 6.9.6.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.9.4...v6.9.6)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoMerge remote-tracking branch 'upstream/pull/2994'
Tom Hughes [Wed, 13 Jan 2021 20:40:48 +0000 (20:40 +0000)]
Merge remote-tracking branch 'upstream/pull/2994'

3 years agoMerge remote-tracking branch 'upstream/pull/3046'
Tom Hughes [Wed, 13 Jan 2021 20:35:04 +0000 (20:35 +0000)]
Merge remote-tracking branch 'upstream/pull/3046'

3 years agoMerge remote-tracking branch 'upstream/pull/3045'
Tom Hughes [Wed, 13 Jan 2021 20:31:21 +0000 (20:31 +0000)]
Merge remote-tracking branch 'upstream/pull/3045'

3 years agoRefactor login form to use bootstrap
Andy Allan [Wed, 13 Jan 2021 19:20:06 +0000 (19:20 +0000)]
Refactor login form to use bootstrap

Care has been taken to preserve exact tabindexes, field values etc.

3 years agoRefactor richtext fields to use a custom bootstrap_form input.
Andy Allan [Wed, 13 Jan 2021 14:05:39 +0000 (14:05 +0000)]
Refactor richtext fields to use a custom bootstrap_form input.

This allows us to use form_group_builder and get all the label and
help text handling in line with other bootstrap_form inputs.

3 years agoAlign the richtext help text height with the height of the textarea.
Andy Allan [Wed, 13 Jan 2021 10:12:15 +0000 (10:12 +0000)]
Align the richtext help text height with the height of the textarea.

This works by setting the card to the same height as its containing flexbox. For perfect alignment, we need to make sure the extra margin at the bottom of the text-area stops applying when they are shown side by side.

3 years agoMerge remote-tracking branch 'upstream/pull/3044'
Tom Hughes [Tue, 12 Jan 2021 23:09:51 +0000 (23:09 +0000)]
Merge remote-tracking branch 'upstream/pull/3044'

3 years agorerun script/misc/update-wiki-pages
Mateusz Konieczny [Tue, 12 Jan 2021 21:56:37 +0000 (22:56 +0100)]
rerun script/misc/update-wiki-pages

3 years agoUse latest major version for all github actions
Tom Hughes [Tue, 12 Jan 2021 22:41:53 +0000 (22:41 +0000)]
Use latest major version for all github actions

3 years agoRestore ruby 2.5 compatibility
Tom Hughes [Mon, 11 Jan 2021 20:04:13 +0000 (20:04 +0000)]
Restore ruby 2.5 compatibility

3 years agoFix new rubocop warnings
Tom Hughes [Mon, 11 Jan 2021 19:14:00 +0000 (19:14 +0000)]
Fix new rubocop warnings

3 years agoRemove redundant gem requirements for unsupported ruby versions
Tom Hughes [Mon, 11 Jan 2021 18:48:27 +0000 (18:48 +0000)]
Remove redundant gem requirements for unsupported ruby versions

3 years agoUnpin rubocop now erb_lint is fixed
Tom Hughes [Mon, 11 Jan 2021 18:39:54 +0000 (18:39 +0000)]
Unpin rubocop now erb_lint is fixed

3 years agoUpdate bundle
Tom Hughes [Mon, 11 Jan 2021 18:38:11 +0000 (18:38 +0000)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 11 Jan 2021 16:46:08 +0000 (17:46 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 7 Jan 2021 14:26:56 +0000 (15:26 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge branch 'pull/3035'
Andy Allan [Wed, 6 Jan 2021 15:41:42 +0000 (15:41 +0000)]
Merge branch 'pull/3035'

3 years agoRemove spacing tweaks and legacy pagination spacing CSS
Andy Allan [Wed, 6 Jan 2021 15:40:53 +0000 (15:40 +0000)]
Remove spacing tweaks and legacy pagination spacing CSS

No need to fight against something that we no longer use.

3 years agoMerge branch 'pull/3024'
Andy Allan [Wed, 6 Jan 2021 15:25:37 +0000 (15:25 +0000)]
Merge branch 'pull/3024'

3 years agoRemove link_to_if since it's in a clause with the same condition
Andy Allan [Wed, 6 Jan 2021 15:24:50 +0000 (15:24 +0000)]
Remove link_to_if since it's in a clause with the same condition

3 years agoMerge remote-tracking branch 'upstream/pull/3038'
Tom Hughes [Wed, 6 Jan 2021 14:19:34 +0000 (14:19 +0000)]
Merge remote-tracking branch 'upstream/pull/3038'

3 years agoRemove both Potlatch versions
Tom Hughes [Tue, 5 Jan 2021 19:45:04 +0000 (19:45 +0000)]
Remove both Potlatch versions

Fixes #2622

3 years agoMerge remote-tracking branch 'upstream/pull/3037'
Tom Hughes [Tue, 5 Jan 2021 18:28:30 +0000 (18:28 +0000)]
Merge remote-tracking branch 'upstream/pull/3037'

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 4 Jan 2021 13:52:37 +0000 (14:52 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoBump eslint from 7.16.0 to 7.17.0
dependabot[bot] [Mon, 4 Jan 2021 05:02:07 +0000 (05:02 +0000)]
Bump eslint from 7.16.0 to 7.17.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.16.0 to 7.17.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.16.0...v7.17.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoTraces: Migrate pagination to bootstrap
Tobias Jordans [Sat, 2 Jan 2021 21:48:25 +0000 (22:48 +0100)]
Traces: Migrate pagination to bootstrap

Same feature, different style.
- Change pagination to use bootstrap default styles
- … but with empty span-tags instead of non-active a-tags
- refactor partial to not use @-variables but get the variables via
the render-call, simplify render-call-syntax
- remove the additional `if @traces.size > 1` inside the pagination
partial since that caused the pagination to disappear on the last page.
The partial will be visible with inactive links.
- Add bootstrap spacer-classes to overwrite commons-css so removing. Eg.
commons also has a pagination class same as bootstrap.

3 years agoDiary entries #index: Simplify bootstrap pagination
Tobias [Sat, 2 Jan 2021 21:24:46 +0000 (22:24 +0100)]
Diary entries #index: Simplify bootstrap pagination

- We can use a span instead of a disabled link as well
- Update to use double quotes everywhere

3 years agoUpdate bundle
Tom Hughes [Fri, 1 Jan 2021 11:55:24 +0000 (11:55 +0000)]
Update bundle

3 years agoRemove unnecessary inflection
Tom Hughes [Fri, 1 Jan 2021 11:54:29 +0000 (11:54 +0000)]
Remove unnecessary inflection

3 years agoSwitch to using the zeitwork autoloader
Tom Hughes [Thu, 10 Dec 2020 14:46:41 +0000 (14:46 +0000)]
Switch to using the zeitwork autoloader

3 years agoVerify that public and trackable traces don't return identity details
Tom Hughes [Wed, 30 Dec 2020 17:58:04 +0000 (17:58 +0000)]
Verify that public and trackable traces don't return identity details

3 years agoDiary entries #index: Migrate to bootstrap pagination
Tobias Jordans [Wed, 30 Dec 2020 13:20:13 +0000 (14:20 +0100)]
Diary entries #index: Migrate to bootstrap pagination

Use https://getbootstrap.com/docs/4.5/components/pagination/ for the pagination.

I tried using link_to_if but this does not work well in this case since multiple changes need to happen for the disabled state.

3 years agoRevert "Switch to using the zeitwork autoloader"
Tom Hughes [Tue, 29 Dec 2020 19:26:58 +0000 (19:26 +0000)]
Revert "Switch to using the zeitwork autoloader"

This reverts commit 127880a73fa461400c53b29c98721e34660bca5e.

3 years agoFix case for zeitwork
Tom Hughes [Tue, 29 Dec 2020 18:54:12 +0000 (18:54 +0000)]
Fix case for zeitwork

3 years agoSwitch to using the zeitwork autoloader
Tom Hughes [Thu, 10 Dec 2020 14:46:41 +0000 (14:46 +0000)]
Switch to using the zeitwork autoloader

3 years agoUpdate bundle
Tom Hughes [Tue, 29 Dec 2020 18:39:25 +0000 (18:39 +0000)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 29 Dec 2020 08:03:29 +0000 (09:03 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge pull request #3018 from tordans/line-break-for-long-urls
Andy Allan [Mon, 28 Dec 2020 11:15:58 +0000 (11:15 +0000)]
Merge pull request #3018 from tordans/line-break-for-long-urls

Break long URLs in blog post show

3 years agoBreak long URLs where richtext is used.
Tobias Jordans [Sun, 27 Dec 2020 13:19:36 +0000 (14:19 +0100)]
Break long URLs where richtext is used.

For example on the blog post show page.

This uses https://getbootstrap.com/docs/4.4/utilities/text/#word-break to break long URLs on the blog post show view.

3 years agoMerge remote-tracking branch 'upstream/pull/3017'
Tom Hughes [Thu, 24 Dec 2020 14:07:41 +0000 (14:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3017'

3 years agoRefactor diary entry forms to use a custom form builder
Andy Allan [Thu, 24 Dec 2020 13:31:04 +0000 (13:31 +0000)]
Refactor diary entry forms to use a custom form builder

3 years agoEnsure richtext editing style rules are only applied on standard forms
Andy Allan [Thu, 24 Dec 2020 13:29:12 +0000 (13:29 +0000)]
Ensure richtext editing style rules are only applied on standard forms

3 years agoMerge remote-tracking branch 'upstream/pull/3016'
Tom Hughes [Wed, 23 Dec 2020 15:24:10 +0000 (15:24 +0000)]
Merge remote-tracking branch 'upstream/pull/3016'

3 years agoMerge remote-tracking branch 'upstream/pull/3015'
Tom Hughes [Wed, 23 Dec 2020 15:02:04 +0000 (15:02 +0000)]
Merge remote-tracking branch 'upstream/pull/3015'

3 years agoReturn the centre of the image if the bbox has no extent
Andy Allan [Wed, 23 Dec 2020 15:01:01 +0000 (15:01 +0000)]
Return the centre of the image if the bbox has no extent

Fixes #3007. If all the provided points in the gpx file have the same
lat/lon, then an image where they are all at the centre seems plausible.

3 years agoRemove SystemTimer and use stdlib Timeout directly
Andy Allan [Wed, 23 Dec 2020 14:25:58 +0000 (14:25 +0000)]
Remove SystemTimer and use stdlib Timeout directly

SystemTimer was only needed on ruby 1.8, and we dropped support for
that a long time ago.

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 22 Dec 2020 13:04:52 +0000 (14:04 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoUpdate bundle
Tom Hughes [Mon, 21 Dec 2020 09:47:00 +0000 (09:47 +0000)]
Update bundle

3 years agoMerge remote-tracking branch 'upstream/pull/3014'
Tom Hughes [Mon, 21 Dec 2020 09:45:22 +0000 (09:45 +0000)]
Merge remote-tracking branch 'upstream/pull/3014'

3 years agoBump eslint from 7.15.0 to 7.16.0
dependabot[bot] [Mon, 21 Dec 2020 05:03:00 +0000 (05:03 +0000)]
Bump eslint from 7.15.0 to 7.16.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.15.0 to 7.16.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.15.0...v7.16.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoMake coverage testing work with parallel tests
Tom Hughes [Fri, 18 Dec 2020 22:39:23 +0000 (22:39 +0000)]
Make coverage testing work with parallel tests

https://github.com/simplecov-ruby/simplecov/issues/718#issuecomment-538201587

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 17 Dec 2020 14:21:34 +0000 (15:21 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3010'
Tom Hughes [Thu, 17 Dec 2020 12:30:05 +0000 (12:30 +0000)]
Merge remote-tracking branch 'upstream/pull/3010'

3 years agoMerge pull request #3009 from gravitystorm/svg_icons
Andy Allan [Thu, 17 Dec 2020 11:44:22 +0000 (11:44 +0000)]
Merge pull request #3009 from gravitystorm/svg_icons

Add updated authentication icons

3 years agoMerge remote-tracking branch 'upstream/pull/3002'
Tom Hughes [Wed, 16 Dec 2020 19:17:22 +0000 (19:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3002'

3 years agoIncrease memory given to the virtualbox vm
Andy Allan [Wed, 16 Dec 2020 18:23:38 +0000 (18:23 +0000)]
Increase memory given to the virtualbox vm

Fixes #2972

Like others, I found that the previous setting caused OOM failures, and
4096 was sufficient. I suspect lower values will also work, but I don't
have time or inclination to bisect a smaller value.

3 years agoUse bootstrap utility class instead of custom css
Andy Allan [Wed, 16 Dec 2020 11:57:34 +0000 (11:57 +0000)]
Use bootstrap utility class instead of custom css

3 years agoIgnore GPX archive entries that aren't regular files
Tom Hughes [Wed, 16 Dec 2020 11:17:51 +0000 (11:17 +0000)]
Ignore GPX archive entries that aren't regular files

Fixes #3008

3 years agoConvert id column for oauth_nonces to bigint
Tom Hughes [Mon, 14 Dec 2020 14:48:59 +0000 (14:48 +0000)]
Convert id column for oauth_nonces to bigint

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 14 Dec 2020 14:14:05 +0000 (15:14 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoUpdate bundle
Tom Hughes [Thu, 10 Dec 2020 14:40:16 +0000 (14:40 +0000)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 10 Dec 2020 12:56:16 +0000 (13:56 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoEnable dependabot for github actions
Tom Hughes [Wed, 9 Dec 2020 22:47:52 +0000 (22:47 +0000)]
Enable dependabot for github actions

3 years agoRemove travis-ci support
Tom Hughes [Wed, 9 Dec 2020 22:45:14 +0000 (22:45 +0000)]
Remove travis-ci support

3 years agoMove coveralls submission to actions workflow
Tom Hughes [Wed, 9 Dec 2020 22:44:31 +0000 (22:44 +0000)]
Move coveralls submission to actions workflow

3 years agoAdd actions workflow to run tests
Tom Hughes [Thu, 21 Nov 2019 19:38:03 +0000 (19:38 +0000)]
Add actions workflow to run tests

3 years agoAdd actions workflow to run lint tools
Tom Hughes [Wed, 9 Dec 2020 16:51:51 +0000 (16:51 +0000)]
Add actions workflow to run lint tools

3 years agoMerge remote-tracking branch 'upstream/pull/2999'
Tom Hughes [Wed, 9 Dec 2020 14:51:04 +0000 (14:51 +0000)]
Merge remote-tracking branch 'upstream/pull/2999'

3 years agoMerge remote-tracking branch 'upstream/pull/2997' into master
Tom Hughes [Tue, 8 Dec 2020 15:30:59 +0000 (15:30 +0000)]
Merge remote-tracking branch 'upstream/pull/2997' into master

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 8 Dec 2020 15:01:22 +0000 (16:01 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoAdd missing html suffix to translation key
Andy Allan [Tue, 8 Dec 2020 13:50:22 +0000 (13:50 +0000)]
Add missing html suffix to translation key

The new key was added to the translations config file in a previous commit.

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 7 Dec 2020 14:56:26 +0000 (15:56 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoAdd CyclOSM layer
Frédéric Rodrigo [Thu, 3 Dec 2020 21:40:53 +0000 (22:40 +0100)]
Add CyclOSM layer

3 years agoUpdate leaflet-osm
Frédéric Rodrigo [Sun, 6 Dec 2020 20:23:48 +0000 (21:23 +0100)]
Update leaflet-osm

3 years agoMerge remote-tracking branch 'upstream/pull/2996' into master
Tom Hughes [Sun, 6 Dec 2020 19:21:29 +0000 (19:21 +0000)]
Merge remote-tracking branch 'upstream/pull/2996' into master

3 years agoBump eslint from 7.14.0 to 7.15.0
dependabot[bot] [Sun, 6 Dec 2020 18:57:28 +0000 (18:57 +0000)]
Bump eslint from 7.14.0 to 7.15.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.14.0 to 7.15.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.14.0...v7.15.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoUpdate bundle
Tom Hughes [Sun, 6 Dec 2020 18:53:36 +0000 (18:53 +0000)]
Update bundle

Pin rubcop to 0.x to avoid erb_lint issues

3 years agoDisable dependabot for ruby gems
Tom Hughes [Sun, 6 Dec 2020 18:47:51 +0000 (18:47 +0000)]
Disable dependabot for ruby gems

Closes #2992

3 years agoMerge remote-tracking branch 'upstream/pull/2993' into master
Tom Hughes [Sun, 6 Dec 2020 18:44:33 +0000 (18:44 +0000)]
Merge remote-tracking branch 'upstream/pull/2993' into master

3 years agoMerge remote-tracking branch 'upstream/pull/2991' into master
Tom Hughes [Sun, 6 Dec 2020 18:37:45 +0000 (18:37 +0000)]
Merge remote-tracking branch 'upstream/pull/2991' into master

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 3 Dec 2020 14:51:48 +0000 (15:51 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoAvoid using raw in html mailer views
Andy Allan [Wed, 2 Dec 2020 15:13:09 +0000 (15:13 +0000)]
Avoid using raw in html mailer views

Use the _html suffix to mark that we expect the translations to contain links.

Unfortunately, we can't use the _html keys for the plain text emails, since the input options (e.g. username, url) will be html-escaped,
before it is passed to the view. So we need to use non-html-suffix keys for the plaintext views, in most cases. Only when the translation
options (e.g. url) are guaranteed to not contain any escapable characters can the same translation key be shared.

3 years agoAdd a test for i18n interpolation into plain and html parts
Andy Allan [Wed, 2 Dec 2020 13:02:25 +0000 (13:02 +0000)]
Add a test for i18n interpolation into plain and html parts

I spent some time working on an alternative translation strategy, without realising some of the plain text implications.

3 years agoMerge pull request #2969 from tuckerrc/diary-updated-date
Andy Allan [Wed, 2 Dec 2020 11:30:22 +0000 (11:30 +0000)]
Merge pull request #2969 from tuckerrc/diary-updated-date

Add last updated date to diary entry page

3 years agoBump aws-sdk-s3 from 1.85.0 to 1.86.0
dependabot[bot] [Wed, 2 Dec 2020 05:01:33 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.85.0 to 1.86.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.85.0 to 1.86.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoMerge remote-tracking branch 'upstream/pull/2989' into master
Tom Hughes [Tue, 1 Dec 2020 22:26:02 +0000 (22:26 +0000)]
Merge remote-tracking branch 'upstream/pull/2989' into master

3 years agoImprove guessing of labels for Nominatim results
Sarah Hoffmann [Tue, 1 Dec 2020 21:37:09 +0000 (22:37 +0100)]
Improve guessing of labels for Nominatim results

This adapts to two changes in place handling by Nominatim:

* Place links that are computed by Nominatim are now found in
  extratags['linked_places']. Keep the check for extratags['place']
  as this may contain an explicitly mapped place label.
* Use address rank for guessing the admin level. This gets normalised
  by Nominatim with respect to country-specific use of admin_level.

Also adds additional labels for admin levels, so that we now have
complete coverage for all levels that are in use in OSM.

3 years agoMerge remote-tracking branch 'upstream/pull/2988' into master
Tom Hughes [Tue, 1 Dec 2020 08:18:59 +0000 (08:18 +0000)]
Merge remote-tracking branch 'upstream/pull/2988' into master

3 years agoMerge remote-tracking branch 'upstream/pull/2987' into master
Tom Hughes [Tue, 1 Dec 2020 08:18:56 +0000 (08:18 +0000)]
Merge remote-tracking branch 'upstream/pull/2987' into master

3 years agoMerge remote-tracking branch 'upstream/pull/2986' into master
Tom Hughes [Tue, 1 Dec 2020 08:18:53 +0000 (08:18 +0000)]
Merge remote-tracking branch 'upstream/pull/2986' into master

3 years agoBump puma from 5.0.4 to 5.1.0
dependabot[bot] [Tue, 1 Dec 2020 05:00:58 +0000 (05:00 +0000)]
Bump puma from 5.0.4 to 5.1.0

Bumps [puma](https://github.com/puma/puma) from 5.0.4 to 5.1.0.
- [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.0.4...v5.1.0)

Signed-off-by: dependabot[bot] <support@github.com>