cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10237 commits 4 branches 1 tag 499 MiB
Commit graph

10237 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
864bde05a8 Merge remote-tracking branch 'upstream/pull/2750' 2020-08-03 08:44:51 +01:00
Tom Hughes
599f99a36f Merge remote-tracking branch 'upstream/pull/2749' 2020-08-03 08:44:49 +01:00
Tom Hughes
528d29af63 Merge remote-tracking branch 'upstream/pull/2748' 2020-08-03 08:44:47 +01:00
Tom Hughes
4c22d6eaec Merge remote-tracking branch 'upstream/pull/2747' 2020-08-03 08:44:44 +01:00
dependabot[bot]
2c5836b18a
Bump autoprefixer-rails from 9.8.6 to 9.8.6.1 
Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 9.8.6 to 9.8.6.1.
- [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/9.8.6...9.8.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-03 05:01:44 +00:00
dependabot[bot]
823b4daa4e
Bump activerecord-import from 1.0.5 to 1.0.6 
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.5 to 1.0.6.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.5...v1.0.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-03 05:01:25 +00:00
dependabot[bot]
597b4684cc
Bump eslint from 7.5.0 to 7.6.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.5.0 to 7.6.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.5.0...v7.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-03 05:01:11 +00:00
dependabot[bot]
5955dab5b7
Bump aasm from 5.0.8 to 5.1.0 
Bumps [aasm](https://github.com/aasm/aasm) from 5.0.8 to 5.1.0.
- [Release notes](https://github.com/aasm/aasm/releases)
- [Changelog](https://github.com/aasm/aasm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aasm/aasm/compare/v5.0.8...v5.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-03 05:01:03 +00:00
Tom Hughes
2d3972249c Fix some rubocop todos 2020-08-02 19:38:58 +01:00
Tom Hughes
f881a8c83c Register warning and error flash types 
Fixes #2743
 2020-08-02 15:53:13 +01:00
Tom Hughes
eee84267f9 Fix rubocop warning 2020-08-02 13:00:21 +01:00
Tom Hughes
ff5c456720 Switch to bundler 2.x 2020-08-02 12:49:32 +01:00
Tom Hughes
0dd03daf34 Target ruby 2.7 for rubocop checks 2020-08-02 12:15:09 +01:00
Tom Hughes
40092bdd0e Run tests on ruby 2.7.0 to match production systems 2020-08-02 12:12:59 +01:00
Tom Hughes
f78c6cb02d Restore erblint workaround 2020-07-31 23:58:08 +01:00
Tom Hughes
77f9aec772 Fix some rubocop todos 2020-07-31 22:45:53 +01:00
Tom Hughes
06952ea2b3 Update rubocop todo 2020-07-31 19:14:32 +01:00
Tom Hughes
3cf383522e Merge remote-tracking branch 'upstream/pull/2742' 2020-07-31 15:54:13 +01:00
Tom Hughes
6e450a8b00 Merge remote-tracking branch 'upstream/pull/2741' 2020-07-31 15:54:10 +01:00
Tom Hughes
6c159b9673 Fix the Command Injection warnings from Brakeman 2020-07-31 15:54:06 +01:00
Quincy Morgan
f7733cd328 Update to iD v2.18.4 2020-07-31 10:37:09 -04:00
dependabot[bot]
7d583d45ee
Bump autoprefixer-rails from 9.8.5 to 9.8.6 
Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 9.8.5 to 9.8.6.
- [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/9.8.5...9.8.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-31 05:01:07 +00:00
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