Rebuild OHM customizations as logical commits on top of upstream - #448
Rebuild OHM customizations as logical commits on top of upstream#448Rub21 wants to merge 13 commits into
Conversation
Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net>
Generated by 🚫 Danger |
Coverage Report for CI Build 31808287802Warning No base build found for commit Coverage: 96.63%Details
Uncovered Changes
Coverage RegressionsRequires a base build to compare against. How to fix this → Coverage Stats
💛 - Coveralls |
1ec5
left a comment
There was a problem hiding this comment.
This is looking pretty good. I only inspected the code but haven’t tried running it. I haven’t gone through our issues to see if any features dropped out. It’ll be easier to detect them in testing anyways.
I included some nitpick comments, in case it’s easy enough to remove those from the diffs.1 The cleaner the diff, the less likely we are to have merge conflicts in the future. Some of the whitespace changes are probably remnants from code that we added and removed at some point.
Footnotes
-
You can do an interactive rebase to rewrite this history. Change
picktoedit, edit the file, then continue the rebase. ↩
Co-authored-by: Sajjad Anwar <sajjadkm@gmail.com> Co-authored-by: Eric Theise <erictheise@gmail.com>
Co-authored-by: Jim McAndrew <jim@loc8.us> Co-authored-by: Greg Allensworth <gregory@greeninfo.org> Co-authored-by: Minh Nguyễn <mxn@1ec5.org>
Co-authored-by: Jim McAndrew <jim@loc8.us> Co-authored-by: Seth Fitzsimmons <seth@mojodna.net> Co-authored-by: Sanjay Bhangar <sanjay@developmentseed.org> Co-authored-by: Sajjad Anwar <sajjadkm@gmail.com> Co-authored-by: Eric Theise <erictheise@gmail.com>
Co-authored-by: Jim McAndrew <jim@loc8.us> Co-authored-by: Seth Fitzsimmons <seth@mojodna.net> Co-authored-by: Sanjay Bhangar <sanjay@developmentseed.org> Co-authored-by: Sajjad Anwar <sajjadkm@gmail.com> Co-authored-by: Eric Theise <erictheise@gmail.com> Co-authored-by: Dan Rademacher <dan@greeninfo.org> Co-authored-by: Greg Allensworth <gregory@greeninfo.org>
Co-authored-by: Jeff Meyer <jeff@gwhat.org> Co-authored-by: Dan Rademacher <dan@greeninfo.org> Co-authored-by: Minh Nguyễn <mxn@1ec5.org> Co-authored-by: Eric Theise <erictheise@gmail.com>
Co-authored-by: Minh Nguyễn <mxn@1ec5.org> Co-authored-by: Eric Theise <erictheise@gmail.com>
Co-authored-by: Dan Rademacher <dan@greeninfo.org> Co-authored-by: mmd-osm <mmd.osm@gmail.com>
Co-authored-by: Jeff Meyer <jeff@gwhat.org> Co-authored-by: Dan Rademacher <dan@greeninfo.org> Co-authored-by: Minh Nguyễn <mxn@1ec5.org> Co-authored-by: Eric Theise <erictheise@gmail.com>
Co-authored-by: Jim McAndrew <jim@loc8.us> Co-authored-by: Seth Fitzsimmons <seth@mojodna.net> Co-authored-by: Eric Theise <erictheise@gmail.com>
2ab234f to
7abe6a7
Compare
7abe6a7 to
ac99a3c
Compare
Co-authored-by: Eric Theise <erictheise@gmail.com>
Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net>
ac99a3c to
ee9fb22
Compare
|
Tests are passing now, the map load timing was breaking some tests, so I bumped Capybara's default_max_wait_time so it waits for the page to finish loading. |
|
Sounds good, it was failing intermittently on other branches for the same reason. |
This PR replaces the old patch-accumulated history with 12 logical commits that contain all OHM customizations, rebuilt on top of the latest upstream master openstreetmap-website-5a02636.
This is the approach agreed in the ticket OpenHistoricalMap/issues#735 as a cleaner baseline for future development and upstream merges.
cc. @1ec5