[10.0][FIX] help_online: Restore commit history and remove bug introduced at merge time - #647
Merged
Merged
Conversation
This reverts commit 95f15c4.
This key is required to get the pages properly imported as web pages
Contributor
Author
lmignon
changed the title
Member
|
What is the problem, Laurent? |
Contributor
Author
|
@pedrobaeza Moreover |
Member
|
Yeah, bug fault of mine. Travis was down due to #ocacodesprint and I wanted to fix #584 (comment) to merge quickly. Also I did not mind on authorship of such a small change and that's why I squashed. In any case, I added the fix here now, but we'll wait for Travis this time 😋. Thanks! |
Member
|
OK, all ✔️, fast-tracking. Thanks @lmignon! (And sorry again 😅) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts #584
The commit history is not honored and a commit added to the initial branch at merge time by @yajo breaks travis.
@dreispt Can you merge this one ASAP?