Skip to content

Fix issue 17169 - New default ddoc theme merges all paragraphs except…#6538

Merged
MartinNowak merged 1 commit intodlang:stablefrom
jacob-carlborg:issue_17169
Feb 16, 2017
Merged

Fix issue 17169 - New default ddoc theme merges all paragraphs except…#6538
MartinNowak merged 1 commit intodlang:stablefrom
jacob-carlborg:issue_17169

Conversation

@jacob-carlborg
Copy link
Contributor

… the first

@dlang-bot
Copy link
Contributor

Fix Bugzilla Description
17169 New default ddoc theme merges all paragraphs except the first

@jacob-carlborg
Copy link
Contributor Author

@Abscissa

@WalterBright
Copy link
Member

What does this actually emit given the source code in the bug report?

@jacob-carlborg
Copy link
Contributor Author

What does this actually emit given the source code in the bug report?

It adds <br><br> between P2 and P3. For the full output see [1], it's by default minimized in the diff view. This is more in line of how it looked like before the new ddoc theme. Here's a before and after example of the rendered result:

Before:

After:

screen shot 2017-02-14 at 08 29 41

[1] https://github.com/jacob-carlborg/dmd/blob/4d67aee38c9b9d4e2a6037bc73b6fcd9d82d13ea/test/compilable/extra-files/ddoc17169.html

@jacob-carlborg
Copy link
Contributor Author

The failing Travis CI tests are unrelated, I think it fails for all PRs. See #6539.

@wilzbach
Copy link
Contributor

@jacob-carlborg all regression fixes should target stable ;-)

@jacob-carlborg
Copy link
Contributor Author

all regression fixes should target stable ;-)

I hate this 😃.

@jacob-carlborg
Copy link
Contributor Author

@wilzbach Will I cause any problems if I change the target branch to "stable"?

@wilzbach
Copy link
Contributor

@wilzbach Will I cause any problems if I change the target branch to "stable"?

GitHub will try to rebase your commit to stable - in the worst case you need to do it yourself afterwards, but I haven't had any problems yet.

@jacob-carlborg jacob-carlborg changed the base branch from master to stable February 15, 2017 12:37
@jacob-carlborg
Copy link
Contributor Author

This doesn't look correct.

@jacob-carlborg
Copy link
Contributor Author

Fixed, no targeting "stable".

@jacob-carlborg
Copy link
Contributor Author

jacob-carlborg commented Feb 16, 2017

@WalterBright @MartinNowak @andralex ping, this is a pretty trivial PR and a regression fix.

@jacob-carlborg
Copy link
Contributor Author

@CyberShadow

@MartinNowak
Copy link
Member

GitHub will try to rebase your commit to stable - in the worst case you need to do it yourself afterwards, but I haven't had any problems yet.

No, github does not do the rebase, you have to do it yourself after changing the base commit.
git rebase --onto upstream/stable upstream/master should work
It's important to push the rebased commit after changing the base branch in github for the tester to get notified and pick up the new base branch.

@MartinNowak MartinNowak merged commit 56ca1da into dlang:stable Feb 16, 2017
@jacob-carlborg
Copy link
Contributor Author

Thanks.

@jacob-carlborg jacob-carlborg deleted the issue_17169 branch February 16, 2017 13:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants