]> git.openstreetmap.org Git - rails.git/log
rails.git
4 years agoRefactor reports form to use bootstrap
Andy Allan [Wed, 12 Aug 2020 14:55:34 +0000 (16:55 +0200)]
Refactor reports form to use bootstrap

4 years agoMerge remote-tracking branch 'upstream/pull/2770'
Tom Hughes [Wed, 12 Aug 2020 07:20:29 +0000 (08:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2770'

4 years agoMerge remote-tracking branch 'upstream/pull/2769'
Tom Hughes [Wed, 12 Aug 2020 07:20:24 +0000 (08:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2769'

4 years agoMerge remote-tracking branch 'upstream/pull/2768'
Tom Hughes [Wed, 12 Aug 2020 07:20:20 +0000 (08:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2768'

4 years agoBump aws-sdk-s3 from 1.77.0 to 1.78.0
dependabot[bot] [Wed, 12 Aug 2020 05:01:46 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.77.0 to 1.78.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.77.0 to 1.78.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>
4 years agoBump bootsnap from 1.4.7 to 1.4.8
dependabot[bot] [Wed, 12 Aug 2020 05:01:30 +0000 (05:01 +0000)]
Bump bootsnap from 1.4.7 to 1.4.8

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.7 to 1.4.8.
- [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.7...v1.4.8)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump aasm from 5.1.0 to 5.1.1
dependabot[bot] [Wed, 12 Aug 2020 05:01:08 +0000 (05:01 +0000)]
Bump aasm from 5.1.0 to 5.1.1

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

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2767'
Tom Hughes [Tue, 11 Aug 2020 17:23:05 +0000 (18:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2767'

4 years agoMerge remote-tracking branch 'upstream/pull/2766'
Tom Hughes [Tue, 11 Aug 2020 17:23:01 +0000 (18:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2766'

4 years agoBump aws-sdk-s3 from 1.76.0 to 1.77.0
dependabot[bot] [Tue, 11 Aug 2020 05:01:18 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.76.0 to 1.77.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.76.0 to 1.77.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>
4 years agoBump rubocop from 0.89.0 to 0.89.1
dependabot[bot] [Tue, 11 Aug 2020 05:00:59 +0000 (05:00 +0000)]
Bump rubocop from 0.89.0 to 0.89.1

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.89.0 to 0.89.1.
- [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.89.0...v0.89.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoFix marker paths for embedded map
Tom Hughes [Mon, 10 Aug 2020 17:20:23 +0000 (18:20 +0100)]
Fix marker paths for embedded map

Fixes #2763

4 years agoMerge remote-tracking branch 'upstream/pull/2765'
Tom Hughes [Mon, 10 Aug 2020 17:11:09 +0000 (18:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2765'

4 years agoMerge remote-tracking branch 'upstream/pull/2764'
Tom Hughes [Mon, 10 Aug 2020 17:11:06 +0000 (18:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2764'

4 years agoBump bootstrap from 4.5.0 to 4.5.2
dependabot[bot] [Mon, 10 Aug 2020 05:01:31 +0000 (05:01 +0000)]
Bump bootstrap from 4.5.0 to 4.5.2

Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.5.0 to 4.5.2.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases)
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.5.0...v4.5.2)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump aws-sdk-s3 from 1.75.0 to 1.76.0
dependabot[bot] [Mon, 10 Aug 2020 05:01:03 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.75.0 to 1.76.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.75.0 to 1.76.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>
4 years agoUpdate rubocop todo
Tom Hughes [Sun, 9 Aug 2020 18:51:45 +0000 (19:51 +0100)]
Update rubocop todo

4 years agoFix some Style/StringConcatenation warnings
Tom Hughes [Sun, 9 Aug 2020 18:46:16 +0000 (19:46 +0100)]
Fix some Style/StringConcatenation warnings

4 years agoFix Style/ExplicitBlockArgument warnings
Tom Hughes [Sun, 9 Aug 2020 17:45:01 +0000 (18:45 +0100)]
Fix Style/ExplicitBlockArgument warnings

4 years agoFix Lint/MissingSuper warnings
Tom Hughes [Sun, 9 Aug 2020 17:32:13 +0000 (18:32 +0100)]
Fix Lint/MissingSuper warnings

4 years agoAdd some extra iD resources to the manifest
Tom Hughes [Sat, 8 Aug 2020 23:37:23 +0000 (00:37 +0100)]
Add some extra iD resources to the manifest

Closes #2762

4 years agoCorrect path for mapnik marker images
Tom Hughes [Sat, 8 Aug 2020 09:47:02 +0000 (10:47 +0100)]
Correct path for mapnik marker images

Fixes #2759

4 years agoIgnore emails from inactive users
Tom Hughes [Fri, 7 Aug 2020 16:19:49 +0000 (17:19 +0100)]
Ignore emails from inactive users

Fixes #2758

4 years agoMerge remote-tracking branch 'upstream/pull/2756'
Tom Hughes [Fri, 7 Aug 2020 08:09:07 +0000 (09:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2756'

4 years agoMerge remote-tracking branch 'upstream/pull/2757'
Tom Hughes [Fri, 7 Aug 2020 08:08:56 +0000 (09:08 +0100)]
Merge remote-tracking branch 'upstream/pull/2757'

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 7 Aug 2020 07:47:59 +0000 (09:47 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoBump leaflet.locatecontrol from 0.71.1 to 0.72.0
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>
4 years agoBump ohauth from 0.2.2 to 1.0.0
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>
4 years agoFix eslint warnings
Tom Hughes [Thu, 6 Aug 2020 21:43:16 +0000 (22:43 +0100)]
Fix eslint warnings

4 years agoFix some new rubocop warnings
Tom Hughes [Thu, 6 Aug 2020 20:56:18 +0000 (21:56 +0100)]
Fix some new rubocop warnings

4 years agoUpdate bundle
Tom Hughes [Thu, 6 Aug 2020 20:46:35 +0000 (21:46 +0100)]
Update bundle

4 years agoReplace querystring parser with qs yarn module
Tom Hughes [Thu, 6 Aug 2020 19:39:42 +0000 (20:39 +0100)]
Replace querystring parser with qs yarn module

4 years agoMove jquery.cookie to be a yarn managed asset
Tom Hughes [Thu, 6 Aug 2020 18:27:58 +0000 (19:27 +0100)]
Move jquery.cookie to be a yarn managed asset

4 years agoMove ohauth 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

4 years agoMove leaflet.locatecontrol 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

4 years agoMove leaflet 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

4 years agoMove jquery.simulate 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

4 years agoMove html5shiv 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

4 years agoFix new rubocop warnings
Tom Hughes [Thu, 6 Aug 2020 17:36:59 +0000 (18:36 +0100)]
Fix new rubocop warnings

4 years agoUpdate erb-lint
Tom Hughes [Thu, 6 Aug 2020 17:14:42 +0000 (18:14 +0100)]
Update erb-lint

4 years agoMerge remote-tracking branch 'upstream/pull/2754'
Tom Hughes [Thu, 6 Aug 2020 17:14:16 +0000 (18:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2754'

4 years agoDon't fall back to name:en if it's not in the user's language list
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

4 years agoBump rubocop from 0.86.0 to 0.89.0
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>
4 years agoMerge remote-tracking branch 'upstream/pull/2667'
Tom Hughes [Wed, 5 Aug 2020 20:50:08 +0000 (21:50 +0100)]
Merge remote-tracking branch 'upstream/pull/2667'

4 years agoMerge remote-tracking branch 'upstream/pull/2753'
Tom Hughes [Wed, 5 Aug 2020 18:14:57 +0000 (19:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2753'

4 years agoMerge remote-tracking branch 'upstream/pull/2752'
Tom Hughes [Wed, 5 Aug 2020 18:14:54 +0000 (19:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2752'

4 years agoBump brakeman from 4.8.2 to 4.9.0
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>
4 years agoMerge remote-tracking branch 'upstream/pull/2751'
Tom Hughes [Tue, 4 Aug 2020 07:14:32 +0000 (08:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2751'

4 years agoBump rotp from 6.0.0 to 6.1.0
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>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 3 Aug 2020 17:48:17 +0000 (19:48 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2750'
Tom Hughes [Mon, 3 Aug 2020 07:44:51 +0000 (08:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2750'

4 years agoMerge remote-tracking branch 'upstream/pull/2749'
Tom Hughes [Mon, 3 Aug 2020 07:44:49 +0000 (08:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2749'

4 years agoMerge remote-tracking branch 'upstream/pull/2748'
Tom Hughes [Mon, 3 Aug 2020 07:44:47 +0000 (08:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2748'

4 years agoMerge remote-tracking branch 'upstream/pull/2747'
Tom Hughes [Mon, 3 Aug 2020 07:44:44 +0000 (08:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2747'

4 years agoBump autoprefixer-rails from 9.8.6 to 9.8.6.1
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>
4 years agoBump activerecord-import from 1.0.5 to 1.0.6
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>
4 years agoBump eslint from 7.5.0 to 7.6.0
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>
4 years agoBump aasm from 5.0.8 to 5.1.0
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>
4 years agoAdded banner for OpenStreetMap 16th birthday
Dorothea Kazazi [Sun, 2 Aug 2020 23:45:51 +0000 (02:45 +0300)]
Added banner for OpenStreetMap 16th birthday

4 years agoFix some rubocop todos
Tom Hughes [Sun, 2 Aug 2020 18:38:58 +0000 (19:38 +0100)]
Fix some rubocop todos

4 years agoRegister warning and error flash types
Tom Hughes [Sun, 2 Aug 2020 14:53:13 +0000 (15:53 +0100)]
Register warning and error flash types

Fixes #2743

4 years agoFix rubocop warning
Tom Hughes [Sun, 2 Aug 2020 12:00:21 +0000 (13:00 +0100)]
Fix rubocop warning

4 years agoSwitch to bundler 2.x
Tom Hughes [Sun, 2 Aug 2020 11:49:32 +0000 (12:49 +0100)]
Switch to bundler 2.x

4 years agoTarget ruby 2.7 for rubocop checks
Tom Hughes [Sun, 2 Aug 2020 11:15:09 +0000 (12:15 +0100)]
Target ruby 2.7 for rubocop checks

4 years agoRun tests on ruby 2.7.0 to match production systems
Tom Hughes [Sun, 2 Aug 2020 11:12:59 +0000 (12:12 +0100)]
Run tests on ruby 2.7.0 to match production systems

4 years agoRestore erblint workaround
Tom Hughes [Fri, 31 Jul 2020 22:58:08 +0000 (23:58 +0100)]
Restore erblint workaround

4 years agoFix some rubocop todos
Tom Hughes [Fri, 31 Jul 2020 21:45:53 +0000 (22:45 +0100)]
Fix some rubocop todos

4 years agoUpdate rubocop todo
Tom Hughes [Fri, 31 Jul 2020 18:14:32 +0000 (19:14 +0100)]
Update rubocop todo

4 years agoMerge remote-tracking branch 'upstream/pull/2742'
Tom Hughes [Fri, 31 Jul 2020 14:54:13 +0000 (15:54 +0100)]
Merge remote-tracking branch 'upstream/pull/2742'

4 years agoMerge remote-tracking branch 'upstream/pull/2741'
Tom Hughes [Fri, 31 Jul 2020 14:54:10 +0000 (15:54 +0100)]
Merge remote-tracking branch 'upstream/pull/2741'

4 years agoFix the Command Injection warnings from Brakeman
Tom Hughes [Mon, 27 Jul 2020 18:11:03 +0000 (19:11 +0100)]
Fix the Command Injection warnings from Brakeman

4 years agoUpdate to iD v2.18.4
Quincy Morgan [Fri, 31 Jul 2020 14:37:09 +0000 (10:37 -0400)]
Update to iD v2.18.4

4 years agoBump autoprefixer-rails from 9.8.5 to 9.8.6
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>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 30 Jul 2020 13:35:19 +0000 (15:35 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge pull request #2737 from openstreetmap/dependabot/bundler/strong_migrations...
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

4 years agoBump 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>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 27 Jul 2020 16:29:55 +0000 (18:29 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2734'
Tom Hughes [Mon, 27 Jul 2020 14:20:39 +0000 (15:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2734'

4 years agoturn_costs=true only for car
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.

4 years agoMerge remote-tracking branch 'upstream/pull/2731'
Tom Hughes [Thu, 23 Jul 2020 20:32:58 +0000 (21:32 +0100)]
Merge remote-tracking branch 'upstream/pull/2731'

4 years agoMerge pull request #2730 from openstreetmap/dependabot/bundler/bootsnap-1.4.7
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

4 years agoMerge pull request #2729 from Firefishy/remove-legacy-openlayers
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

4 years agoBump strong_migrations from 0.6.8 to 0.7.0
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>
4 years agoBump bootsnap from 1.4.6 to 1.4.7
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>
4 years agoRemove legacy OpenLayers
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

4 years agoFix the CrossSiteScripting warnings from Brakeman
Tom Hughes [Wed, 22 Jul 2020 19:57:16 +0000 (20:57 +0100)]
Fix the CrossSiteScripting warnings from Brakeman

4 years agoMerge remote-tracking branch 'upstream/pull/2727'
Tom Hughes [Wed, 22 Jul 2020 18:29:08 +0000 (19:29 +0100)]
Merge remote-tracking branch 'upstream/pull/2727'

4 years agoMerge remote-tracking branch 'upstream/pull/2725'
Tom Hughes [Wed, 22 Jul 2020 18:29:05 +0000 (19:29 +0100)]
Merge remote-tracking branch 'upstream/pull/2725'

4 years agoFix the Redirect warnings from Brakeman
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.

4 years agoUse the worldCopyJump option for leaflet overlays
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

4 years agoAdd some changsets that shouldn't be selected
Andy Allan [Wed, 22 Jul 2020 15:51:43 +0000 (17:51 +0200)]
Add some changsets that shouldn't be selected

4 years agoMerge remote-tracking branch 'upstream/pull/2726'
Tom Hughes [Wed, 22 Jul 2020 15:48:53 +0000 (16:48 +0100)]
Merge remote-tracking branch 'upstream/pull/2726'

4 years agoUpdate to iD v2.18.3
Quincy Morgan [Wed, 22 Jul 2020 15:44:42 +0000 (11:44 -0400)]
Update to iD v2.18.3

4 years agoRefactor changeset index testing to assert against objects, not db queries
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

4 years agoRefator way_full test to avoid relying on non-existant fixtures
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

4 years agoMerge remote-tracking branch 'upstream/pull/2723'
Tom Hughes [Wed, 22 Jul 2020 14:02:51 +0000 (15:02 +0100)]
Merge remote-tracking branch 'upstream/pull/2723'

4 years agoMerge remote-tracking branch 'upstream/pull/2724'
Tom Hughes [Wed, 22 Jul 2020 12:44:37 +0000 (13:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2724'

4 years agoAdd a browse map link to notes
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.

4 years agoUse a named path instead of explicit controllers and actions
Andy Allan [Wed, 22 Jul 2020 12:04:42 +0000 (14:04 +0200)]
Use a named path instead of explicit controllers and actions

4 years agoUse Brakeman for static code analysis
Andy Allan [Wed, 22 Jul 2020 11:37:38 +0000 (13:37 +0200)]
Use Brakeman for static code analysis