Commit graph

10763 commits

Author SHA1 Message Date
Tom Hughes
da42319b2c Update bundle 2020-12-21 09:47:00 +00:00
Tom Hughes
58abbf17f2 Merge remote-tracking branch 'upstream/pull/3014' 2020-12-21 09:45:22 +00:00
dependabot[bot]
5366e67a40
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>
2020-12-21 05:03:00 +00:00
Tom Hughes
c9a4c78146 Make coverage testing work with parallel tests
https://github.com/simplecov-ruby/simplecov/issues/718#issuecomment-538201587
2020-12-18 22:39:23 +00:00
translatewiki.net
c63637f304 Localisation updates from https://translatewiki.net. 2020-12-17 15:21:34 +01:00
Tom Hughes
3f6f62b398 Merge remote-tracking branch 'upstream/pull/3010' 2020-12-17 12:30:05 +00:00
Andy Allan
bd1420a7c5
Merge pull request #3009 from gravitystorm/svg_icons
Add updated authentication icons
2020-12-17 11:44:22 +00:00
Tom Hughes
aeb9c4df97 Merge remote-tracking branch 'upstream/pull/3002' 2020-12-16 19:17:22 +00:00
Andy Allan
1b4a06adef 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.
2020-12-16 18:25:39 +00:00
Andy Allan
c192bd0d40 Use bootstrap utility class instead of custom css 2020-12-16 17:34:12 +00:00
Tom Hughes
2490fdc496 Ignore GPX archive entries that aren't regular files
Fixes #3008
2020-12-16 11:17:51 +00:00
Tom Hughes
384ac46102 Convert id column for oauth_nonces to bigint 2020-12-14 14:48:59 +00:00
translatewiki.net
2168ad2108 Localisation updates from https://translatewiki.net. 2020-12-14 15:14:05 +01:00
Tom Hughes
6e68613545 Update bundle 2020-12-10 14:40:16 +00:00
translatewiki.net
0297cec87b Localisation updates from https://translatewiki.net. 2020-12-10 13:56:16 +01:00
Tom Hughes
41339fffd5 Enable dependabot for github actions 2020-12-10 00:11:50 +00:00
Tom Hughes
93a57af6aa Remove travis-ci support 2020-12-10 00:11:50 +00:00
Tom Hughes
4a9f8a5e69 Move coveralls submission to actions workflow 2020-12-10 00:11:50 +00:00
Tom Hughes
efef67447b Add actions workflow to run tests 2020-12-09 22:07:40 +00:00
Tom Hughes
e027d5fc5c Add actions workflow to run lint tools 2020-12-09 22:07:40 +00:00
Tom Hughes
88ba316abe Merge remote-tracking branch 'upstream/pull/2999' 2020-12-09 14:51:04 +00:00
Tom Hughes
fec3b35762 Merge remote-tracking branch 'upstream/pull/2997' into master 2020-12-08 15:30:59 +00:00
translatewiki.net
1985142ff5 Localisation updates from https://translatewiki.net. 2020-12-08 16:01:22 +01:00
Andy Allan
651217e1bc Add missing html suffix to translation key
The new key was added to the translations config file in a previous commit.
2020-12-08 13:50:22 +00:00
translatewiki.net
f8f327179c Localisation updates from https://translatewiki.net. 2020-12-07 15:56:26 +01:00
Frédéric Rodrigo
bab39572a1 Add CyclOSM layer 2020-12-06 21:29:36 +01:00
Frédéric Rodrigo
6b38c8ab5c Update leaflet-osm 2020-12-06 21:24:41 +01:00
Tom Hughes
6bfecfce1f Merge remote-tracking branch 'upstream/pull/2996' into master 2020-12-06 19:21:29 +00:00
dependabot[bot]
d5d92e6056
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>
2020-12-06 18:57:28 +00:00
Tom Hughes
93f3a56487 Update bundle
Pin rubcop to 0.x to avoid erb_lint issues
2020-12-06 18:53:36 +00:00
Tom Hughes
68f147e6d4 Disable dependabot for ruby gems
Closes #2992
2020-12-06 18:47:51 +00:00
Tom Hughes
92712591c9 Merge remote-tracking branch 'upstream/pull/2993' into master 2020-12-06 18:44:33 +00:00
Tom Hughes
d5ba77e42b Merge remote-tracking branch 'upstream/pull/2991' into master 2020-12-06 18:37:45 +00:00
translatewiki.net
2d2b1f1f31 Localisation updates from https://translatewiki.net. 2020-12-03 15:51:48 +01:00
Andy Allan
78dd142df4 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.
2020-12-02 15:13:09 +00:00
Andy Allan
dd8e5f04e3 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.
2020-12-02 13:02:25 +00:00
Andy Allan
48b85a7fee
Merge pull request #2969 from tuckerrc/diary-updated-date
Add last updated date to diary entry page
2020-12-02 11:30:22 +00:00
dependabot[bot]
1869320f3e
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>
2020-12-02 05:01:33 +00:00
Tom Hughes
404f99af1a Merge remote-tracking branch 'upstream/pull/2989' into master 2020-12-01 22:26:02 +00:00
Sarah Hoffmann
a7b95e2a63 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.
2020-12-01 22:52:40 +01:00
Tom Hughes
c418523ed8 Merge remote-tracking branch 'upstream/pull/2988' into master 2020-12-01 08:18:59 +00:00
Tom Hughes
aae3ccd7ba Merge remote-tracking branch 'upstream/pull/2987' into master 2020-12-01 08:18:56 +00:00
Tom Hughes
1ff2ec6705 Merge remote-tracking branch 'upstream/pull/2986' into master 2020-12-01 08:18:53 +00:00
dependabot[bot]
088bc084ef
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>
2020-12-01 05:00:58 +00:00
translatewiki.net
78137c93b5 Localisation updates from https://translatewiki.net. 2020-11-30 17:11:29 +01:00
dependabot[bot]
3bb43e707e
Bump listen from 3.3.1 to 3.3.3
Bumps [listen](https://github.com/guard/listen) from 3.3.1 to 3.3.3.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.3.1...v3.3.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-30 05:03:14 +00:00
dependabot[bot]
1ff6cdc997
Bump rubocop-performance from 1.9.0 to 1.9.1
Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.9.0 to 1.9.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-performance/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-performance/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-performance/compare/v1.9.0...v1.9.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-30 05:02:46 +00:00
Tom Hughes
fccf20edb2 Merge remote-tracking branch 'upstream/pull/2985' into master 2020-11-27 08:53:16 +00:00
Tom Hughes
fcf868c445 Merge remote-tracking branch 'upstream/pull/2984' into master 2020-11-27 08:53:13 +00:00
dependabot[bot]
e7c89a97e1
Bump autoprefixer-rails from 10.0.2.0 to 10.0.3.0
Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 10.0.2.0 to 10.0.3.0.
- [Release notes](https://github.com/ai/autoprefixer-rails/releases)
- [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ai/autoprefixer-rails/compare/10.0.2.0...10.0.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-27 05:02:12 +00:00