]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Fri, 7 Aug 2020 16:19:49 +0000 (17:19 +0100)]
Ignore emails from inactive users
Fixes #2758
Tom Hughes [Fri, 7 Aug 2020 08:09:07 +0000 (09:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2756'
Tom Hughes [Fri, 7 Aug 2020 08:08:56 +0000 (09:08 +0100)]
Merge remote-tracking branch 'upstream/pull/2757'
translatewiki.net [Fri, 7 Aug 2020 07:47:59 +0000 (09:47 +0200)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Fri, 7 Aug 2020 05:01:28 +0000 (05:01 +0000)]
Bump leaflet.locatecontrol from 0.71.1 to 0.72.0
Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.71.1 to 0.72.0.
- [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.71.1...v0.72.0)
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Fri, 7 Aug 2020 05:01:19 +0000 (05:01 +0000)]
Bump ohauth from 0.2.2 to 1.0.0
Bumps [ohauth](https://github.com/osmlab/ohauth) from 0.2.2 to 1.0.0.
- [Release notes](https://github.com/osmlab/ohauth/releases)
- [Changelog](https://github.com/osmlab/ohauth/blob/master/CHANGELOG.md)
- [Commits](https://github.com/osmlab/ohauth/compare/v0.2.2...v1.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Thu, 6 Aug 2020 21:43:16 +0000 (22:43 +0100)]
Fix eslint warnings
Tom Hughes [Thu, 6 Aug 2020 20:56:18 +0000 (21:56 +0100)]
Fix some new rubocop warnings
Tom Hughes [Thu, 6 Aug 2020 20:46:35 +0000 (21:46 +0100)]
Update bundle
Tom Hughes [Thu, 6 Aug 2020 19:39:42 +0000 (20:39 +0100)]
Replace querystring parser with qs yarn module
Tom Hughes [Thu, 6 Aug 2020 18:27:58 +0000 (19:27 +0100)]
Move jquery.cookie to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 18:09:32 +0000 (19:09 +0100)]
Move ohauth to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 18:08:03 +0000 (19:08 +0100)]
Move leaflet.locatecontrol to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 18:04:57 +0000 (19:04 +0100)]
Move leaflet to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 18:00:50 +0000 (19:00 +0100)]
Move jquery.simulate to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 17:56:04 +0000 (18:56 +0100)]
Move html5shiv to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 17:36:59 +0000 (18:36 +0100)]
Fix new rubocop warnings
Tom Hughes [Thu, 6 Aug 2020 17:14:42 +0000 (18:14 +0100)]
Update erb-lint
Tom Hughes [Thu, 6 Aug 2020 17:14:16 +0000 (18:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2754'
Tom Hughes [Thu, 6 Aug 2020 13:21:30 +0000 (14:21 +0100)]
Don't fall back to name:en if it's not in the user's language list
Fix to #2755
dependabot[bot] [Thu, 6 Aug 2020 05:01:33 +0000 (05:01 +0000)]
Bump rubocop from 0.86.0 to 0.89.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.86.0 to 0.89.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.86.0...v0.89.0)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Wed, 5 Aug 2020 20:50:08 +0000 (21:50 +0100)]
Merge remote-tracking branch 'upstream/pull/2667'
Tom Hughes [Wed, 5 Aug 2020 18:14:57 +0000 (19:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2753'
Tom Hughes [Wed, 5 Aug 2020 18:14:54 +0000 (19:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2752'
dependabot[bot] [Wed, 5 Aug 2020 05:02:23 +0000 (05:02 +0000)]
Bump brakeman from 4.8.2 to 4.9.0
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.8.2 to 4.9.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.8.2...v4.9.0)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Tue, 4 Aug 2020 07:14:32 +0000 (08:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2751'
dependabot[bot] [Tue, 4 Aug 2020 05:01:07 +0000 (05:01 +0000)]
Bump rotp from 6.0.0 to 6.1.0
Bumps [rotp](https://github.com/mdp/rotp) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/mdp/rotp/releases)
- [Changelog](https://github.com/mdp/rotp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mdp/rotp/compare/v6.0.0...v6.1.0)
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Mon, 3 Aug 2020 17:48:17 +0000 (19:48 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 3 Aug 2020 07:44:51 +0000 (08:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2750'
Tom Hughes [Mon, 3 Aug 2020 07:44:49 +0000 (08:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2749'
Tom Hughes [Mon, 3 Aug 2020 07:44:47 +0000 (08:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2748'
Tom Hughes [Mon, 3 Aug 2020 07:44:44 +0000 (08:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2747'
dependabot[bot] [Mon, 3 Aug 2020 05:01:44 +0000 (05:01 +0000)]
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>
dependabot[bot] [Mon, 3 Aug 2020 05:01:25 +0000 (05:01 +0000)]
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>
dependabot[bot] [Mon, 3 Aug 2020 05:01:11 +0000 (05:01 +0000)]
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>
dependabot[bot] [Mon, 3 Aug 2020 05:01:03 +0000 (05:01 +0000)]
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>
Dorothea Kazazi [Sun, 2 Aug 2020 23:45:51 +0000 (02:45 +0300)]
Added banner for OpenStreetMap 16th birthday
Tom Hughes [Sun, 2 Aug 2020 18:38:58 +0000 (19:38 +0100)]
Fix some rubocop todos
Tom Hughes [Sun, 2 Aug 2020 14:53:13 +0000 (15:53 +0100)]
Register warning and error flash types
Fixes #2743
Tom Hughes [Sun, 2 Aug 2020 12:00:21 +0000 (13:00 +0100)]
Fix rubocop warning
Tom Hughes [Sun, 2 Aug 2020 11:49:32 +0000 (12:49 +0100)]
Switch to bundler 2.x
Tom Hughes [Sun, 2 Aug 2020 11:15:09 +0000 (12:15 +0100)]
Target ruby 2.7 for rubocop checks
Tom Hughes [Sun, 2 Aug 2020 11:12:59 +0000 (12:12 +0100)]
Run tests on ruby 2.7.0 to match production systems
Tom Hughes [Fri, 31 Jul 2020 22:58:08 +0000 (23:58 +0100)]
Restore erblint workaround
Tom Hughes [Fri, 31 Jul 2020 21:45:53 +0000 (22:45 +0100)]
Fix some rubocop todos
Tom Hughes [Fri, 31 Jul 2020 18:14:32 +0000 (19:14 +0100)]
Update rubocop todo
Tom Hughes [Fri, 31 Jul 2020 14:54:13 +0000 (15:54 +0100)]
Merge remote-tracking branch 'upstream/pull/2742'
Tom Hughes [Fri, 31 Jul 2020 14:54:10 +0000 (15:54 +0100)]
Merge remote-tracking branch 'upstream/pull/2741'
Tom Hughes [Mon, 27 Jul 2020 18:11:03 +0000 (19:11 +0100)]
Fix the Command Injection warnings from Brakeman
Quincy Morgan [Fri, 31 Jul 2020 14:37:09 +0000 (10:37 -0400)]
Update to iD v2.18.4
dependabot[bot] [Fri, 31 Jul 2020 05:01:07 +0000 (05:01 +0000)]
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>
translatewiki.net [Thu, 30 Jul 2020 13:35:19 +0000 (15:35 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 29 Jul 2020 10:15:07 +0000 (12:15 +0200)]
Merge pull request #2737 from openstreetmap/dependabot/bundler/strong_migrations-0.7.1
Bump strong_migrations from 0.7.0 to 0.7.1
dependabot[bot] [Tue, 28 Jul 2020 05:02:40 +0000 (05:02 +0000)]
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>
translatewiki.net [Mon, 27 Jul 2020 16:29:55 +0000 (18:29 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 27 Jul 2020 14:20:39 +0000 (15:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2734'
Peter [Mon, 27 Jul 2020 11:04:52 +0000 (13:04 +0200)]
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.
Tom Hughes [Thu, 23 Jul 2020 20:32:58 +0000 (21:32 +0100)]
Merge remote-tracking branch 'upstream/pull/2731'
Andy Allan [Thu, 23 Jul 2020 06:44:39 +0000 (08:44 +0200)]
Merge pull request #2730 from openstreetmap/dependabot/bundler/bootsnap-1.4.7
Bump bootsnap from 1.4.6 to 1.4.7
Andy Allan [Thu, 23 Jul 2020 06:44:11 +0000 (08:44 +0200)]
Merge pull request #2729 from Firefishy/remove-legacy-openlayers
Remove legacy OpenLayers files
dependabot[bot] [Thu, 23 Jul 2020 06:40:23 +0000 (06:40 +0000)]
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>
dependabot[bot] [Thu, 23 Jul 2020 05:10:39 +0000 (05:10 +0000)]
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>
Grant Slater [Wed, 22 Jul 2020 22:10:32 +0000 (23:10 +0100)]
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
Tom Hughes [Wed, 22 Jul 2020 19:57:16 +0000 (20:57 +0100)]
Fix the CrossSiteScripting warnings from Brakeman
Tom Hughes [Wed, 22 Jul 2020 18:29:08 +0000 (19:29 +0100)]
Merge remote-tracking branch 'upstream/pull/2727'
Tom Hughes [Wed, 22 Jul 2020 18:29:05 +0000 (19:29 +0100)]
Merge remote-tracking branch 'upstream/pull/2725'
Tom Hughes [Wed, 22 Jul 2020 18:13:19 +0000 (19:13 +0100)]
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.
Andy Allan [Wed, 22 Jul 2020 15:54:10 +0000 (17:54 +0200)]
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
Andy Allan [Wed, 22 Jul 2020 15:51:43 +0000 (17:51 +0200)]
Add some changsets that shouldn't be selected
Tom Hughes [Wed, 22 Jul 2020 15:48:53 +0000 (16:48 +0100)]
Merge remote-tracking branch 'upstream/pull/2726'
Quincy Morgan [Wed, 22 Jul 2020 15:44:42 +0000 (11:44 -0400)]
Update to iD v2.18.3
Andy Allan [Wed, 22 Jul 2020 15:25:10 +0000 (17:25 +0200)]
Refactor changeset index testing to assert against objects, not db queries
This avoids the situation where tests pass despite an empty db.
Refs #2614
Andy Allan [Wed, 22 Jul 2020 14:10:15 +0000 (16:10 +0200)]
Refator way_full test to avoid relying on non-existant fixtures
Refs #2614
Tom Hughes [Wed, 22 Jul 2020 14:02:51 +0000 (15:02 +0100)]
Merge remote-tracking branch 'upstream/pull/2723'
Tom Hughes [Wed, 22 Jul 2020 12:44:37 +0000 (13:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2724'
Andy Allan [Wed, 22 Jul 2020 12:18:01 +0000 (14:18 +0200)]
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.
Andy Allan [Wed, 22 Jul 2020 12:04:42 +0000 (14:04 +0200)]
Use a named path instead of explicit controllers and actions
Andy Allan [Wed, 22 Jul 2020 11:37:38 +0000 (13:37 +0200)]
Use Brakeman for static code analysis
Tom Hughes [Wed, 22 Jul 2020 07:33:38 +0000 (08:33 +0100)]
Merge remote-tracking branch 'upstream/pull/2722'
dependabot[bot] [Wed, 22 Jul 2020 05:03:19 +0000 (05:03 +0000)]
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>
Tom Hughes [Tue, 21 Jul 2020 14:46:47 +0000 (15:46 +0100)]
Merge remote-tracking branch 'upstream/pull/2720'
Quincy Morgan [Tue, 21 Jul 2020 14:30:16 +0000 (10:30 -0400)]
Update to iD v2.18.2
Quincy Morgan [Tue, 21 Jul 2020 13:22:23 +0000 (09:22 -0400)]
Use legacy build of iD
Quincy Morgan [Tue, 21 Jul 2020 00:46:26 +0000 (20:46 -0400)]
Properly include iD's external data files
Quincy Morgan [Mon, 20 Jul 2020 20:14:28 +0000 (16:14 -0400)]
Update iD initialization for v2.18.1
Quincy Morgan [Mon, 20 Jul 2020 20:12:50 +0000 (16:12 -0400)]
Update to iD v2.18.1
translatewiki.net [Mon, 20 Jul 2020 17:53:23 +0000 (19:53 +0200)]
Localisation updates from https://translatewiki.net.
Quincy Morgan [Mon, 20 Jul 2020 16:53:19 +0000 (12:53 -0400)]
Update to iD v2.18.0
Tom Hughes [Mon, 20 Jul 2020 10:46:27 +0000 (11:46 +0100)]
Merge remote-tracking branch 'upstream/pull/2719'
Tom Hughes [Mon, 20 Jul 2020 10:46:21 +0000 (11:46 +0100)]
Merge remote-tracking branch 'upstream/pull/2718'
dependabot[bot] [Mon, 20 Jul 2020 05:18:59 +0000 (05:18 +0000)]
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>
dependabot[bot] [Mon, 20 Jul 2020 05:18:58 +0000 (05:18 +0000)]
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>
Tom Hughes [Sun, 19 Jul 2020 18:54:17 +0000 (19:54 +0100)]
Fix eslint warnings
Tom Hughes [Sun, 19 Jul 2020 18:38:10 +0000 (19:38 +0100)]
Drop ch.disable from graphhopper parameters
Tom Hughes [Fri, 17 Jul 2020 08:05:12 +0000 (09:05 +0100)]
Merge remote-tracking branch 'upstream/pull/2712'
dependabot[bot] [Fri, 17 Jul 2020 07:20:55 +0000 (07:20 +0000)]
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>
Tom Hughes [Thu, 16 Jul 2020 18:30:55 +0000 (19:30 +0100)]
Merge remote-tracking branch 'upstream/pull/2695'
Tom Hughes [Wed, 15 Jul 2020 20:31:18 +0000 (21:31 +0100)]
Merge remote-tracking branch 'upstream/pull/2711'
Andy Allan [Wed, 15 Jul 2020 17:13:35 +0000 (19:13 +0200)]
Remove unused warning css
Andy Allan [Wed, 15 Jul 2020 17:10:59 +0000 (19:10 +0200)]
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!