Commit graph

11570 commits

Author SHA1 Message Date
translatewiki.net
42ea4a12ca Localisation updates from https://translatewiki.net. 2020-07-30 15:35:19 +02:00
Andy Allan
b90f06d84c
Merge pull request #2737 from openstreetmap/dependabot/bundler/strong_migrations-0.7.1
Bump strong_migrations from 0.7.0 to 0.7.1
2020-07-29 12:15:07 +02:00
dependabot[bot]
6b5dada85a
Bump strong_migrations from 0.7.0 to 0.7.1
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.0...v0.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-28 05:02:40 +00:00
translatewiki.net
f17a83992d Localisation updates from https://translatewiki.net. 2020-07-27 18:29:55 +02:00
Tom Hughes
77e91beba1 Merge remote-tracking branch 'upstream/pull/2734' 2020-07-27 15:20:39 +01:00
Peter
5444506976
turn_costs=true only for car
I know there was a bit forth and back in #2695 and my last recommendation was to use turn_costs=true. This was not intended for bike and foot.
2020-07-27 13:04:52 +02:00
Tom Hughes
44c45b1fcd Merge remote-tracking branch 'upstream/pull/2731' 2020-07-23 21:32:58 +01:00
Andy Allan
396e87bcc0
Merge pull request #2730 from openstreetmap/dependabot/bundler/bootsnap-1.4.7
Bump bootsnap from 1.4.6 to 1.4.7
2020-07-23 08:44:39 +02:00
Andy Allan
340d62b7ca
Merge pull request #2729 from Firefishy/remove-legacy-openlayers
Remove legacy OpenLayers files
2020-07-23 08:44:11 +02:00
dependabot[bot]
2f9dd76b55
Bump strong_migrations from 0.6.8 to 0.7.0
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.6.8 to 0.7.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.6.8...v0.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-23 06:40:23 +00:00
dependabot[bot]
1961e2dbd9
Bump bootsnap from 1.4.6 to 1.4.7
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.6 to 1.4.7.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.6...v1.4.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-23 05:10:39 +00:00
Grant Slater
4a72ba3bd4 Remove legacy OpenLayers
Remove legacy OpenLayers code, which for www.openstreetmap.org is
now managed by https://github.com/openstreetmap/chef/tree/master/cookbooks/web/files/default/static/openlayers
2020-07-22 23:10:35 +01:00
Tom Hughes
c4abe8eb28 Fix the CrossSiteScripting warnings from Brakeman 2020-07-22 20:57:16 +01:00
Tom Hughes
ca92fe3359 Merge remote-tracking branch 'upstream/pull/2727' 2020-07-22 19:29:08 +01:00
Tom Hughes
a792b74bea Merge remote-tracking branch 'upstream/pull/2725' 2020-07-22 19:29:05 +01:00
Tom Hughes
d4130bcac8 Fix the Redirect warnings from Brakeman
Unfortunately I've had to leave the check disabed as Brakeman
can't see inside the safe_referer method so doesn't realise that
it is cleaning the referer.
2020-07-22 19:23:46 +01:00
Andy Allan
56fdf73b65 Use the worldCopyJump option for leaflet overlays
This means that if you pan to a 'copy' of the world, the overlays
reappear on that copy.

Fixes #2040
2020-07-22 17:54:10 +02:00
Andy Allan
47d11763fb Add some changsets that shouldn't be selected 2020-07-22 17:51:43 +02:00
Tom Hughes
86428201dd Merge remote-tracking branch 'upstream/pull/2726' 2020-07-22 16:48:53 +01:00
Quincy Morgan
9a5b3ffd6b Update to iD v2.18.3 2020-07-22 11:44:42 -04:00
Andy Allan
e7dc2f2e55 Refactor changeset index testing to assert against objects, not db queries
This avoids the situation where tests pass despite an empty db.

Refs #2614
2020-07-22 17:39:48 +02:00
Andy Allan
b23d6a5445 Refator way_full test to avoid relying on non-existant fixtures
Refs #2614
2020-07-22 16:33:33 +02:00
Tom Hughes
c47ae99942 Merge remote-tracking branch 'upstream/pull/2723' 2020-07-22 15:02:51 +01:00
Tom Hughes
bc3a5adc79 Merge remote-tracking branch 'upstream/pull/2724' 2020-07-22 13:44:37 +01:00
Andy Allan
20ed4df472 Add a browse map link to notes
This matches the one for nodes. Fixes #1355. Replacement for #1773.

An unstyled list works better for the details section, particularly
when all three are shown.
2020-07-22 14:18:59 +02:00
Andy Allan
499a60c330 Use a named path instead of explicit controllers and actions 2020-07-22 14:04:42 +02:00
Andy Allan
6719d269e3 Use Brakeman for static code analysis 2020-07-22 13:37:38 +02:00
Tom Hughes
606d2e51c5 Merge remote-tracking branch 'upstream/pull/2722' 2020-07-22 08:33:38 +01:00
dependabot[bot]
a997834d1d
Bump aws-sdk-s3 from 1.74.0 to 1.75.0
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.74.0 to 1.75.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-07-22 05:03:19 +00:00
Tom Hughes
cf3c631cdf Merge remote-tracking branch 'upstream/pull/2720' 2020-07-21 15:46:47 +01:00
Quincy Morgan
32c3000af7 Update to iD v2.18.2 2020-07-21 10:30:16 -04:00
Quincy Morgan
1c8fbe329d Use legacy build of iD 2020-07-21 09:22:23 -04:00
Quincy Morgan
00bcd33722 Properly include iD's external data files 2020-07-20 20:46:26 -04:00
Quincy Morgan
de3ddafcd2 Update iD initialization for v2.18.1 2020-07-20 16:14:28 -04:00
Quincy Morgan
b7f022ecbe Update to iD v2.18.1 2020-07-20 16:12:50 -04:00
translatewiki.net
efdeca235f Localisation updates from https://translatewiki.net. 2020-07-20 19:53:23 +02:00
Quincy Morgan
c9310e10a4 Update to iD v2.18.0 2020-07-20 12:53:19 -04:00
Tom Hughes
b71eefe0e7 Merge remote-tracking branch 'upstream/pull/2719' 2020-07-20 11:46:27 +01:00
Tom Hughes
af26c9fe60 Merge remote-tracking branch 'upstream/pull/2718' 2020-07-20 11:46:21 +01:00
dependabot[bot]
f22aa8cf68
Bump rubocop-performance from 1.7.0 to 1.7.1
Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.7.0 to 1.7.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.7.0...v1.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-20 05:18:59 +00:00
dependabot[bot]
00908718e6
Bump eslint from 7.4.0 to 7.5.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.4.0 to 7.5.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.4.0...v7.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-20 05:18:58 +00:00
Tom Hughes
7986576b0e Fix eslint warnings 2020-07-19 19:54:17 +01:00
Tom Hughes
2898633e72 Drop ch.disable from graphhopper parameters 2020-07-19 19:38:10 +01:00
Tom Hughes
65b984f90b Merge remote-tracking branch 'upstream/pull/2712' 2020-07-17 09:05:12 +01:00
dependabot[bot]
78d0e43f2e
Bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-17 07:20:55 +00:00
Tom Hughes
a9b00e16e7 Merge remote-tracking branch 'upstream/pull/2695' 2020-07-16 19:30:55 +01:00
Tom Hughes
8a013c0a96 Merge remote-tracking branch 'upstream/pull/2711' 2020-07-15 21:31:18 +01:00
Andy Allan
89a57f33ef Remove unused warning css 2020-07-15 19:34:19 +02:00
Andy Allan
0c098c3a1d Convert data feature warning to use bootstrap alert
Also rearrange dialog to fit with standard sidebar layouts, so that
the close icon and load buttons are not within the paragraph.

There may be a better way to construct this!
2020-07-15 19:34:19 +02:00
Andy Allan
3012201160 Convert warnings to use bootstrap alerts
The new note is guidance, rather than a warning, so it gets the info
background
2020-07-15 19:09:46 +02:00