Skip to content

Comments

Merge remote-tracking branch 'upstream/stable' into merge_stable#2189

Merged
dlang-bot merged 3 commits intodlang:masterfrom
MartinNowak:merge_stable
Feb 7, 2018
Merged

Merge remote-tracking branch 'upstream/stable' into merge_stable#2189
dlang-bot merged 3 commits intodlang:masterfrom
MartinNowak:merge_stable

Conversation

@MartinNowak
Copy link
Member

Conflicts:
changelog/changelog.ddoc
posix.mak

- replaced on master
- just so to temporarily fix doc building on stable
# Conflicts:
#	changelog/changelog.ddoc
#	posix.mak
@dlang-bot
Copy link
Contributor

Thanks for your pull request, @MartinNowak!

Bugzilla references

Your PR doesn't reference any Bugzilla issue.

If your PR contains non-trivial changes, please reference a Bugzilla issue or create a manual changelog.

Copy link
Contributor

@wilzbach wilzbach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW did you realize that you don't need to run update_nav.sh anymore?
It's now automatically done by the preprocessor for you.

@dlang-bot dlang-bot merged commit ac13af3 into dlang:master Feb 7, 2018
@MartinNowak MartinNowak deleted the merge_stable branch February 7, 2018 22:24
@MartinNowak
Copy link
Member Author

I didn't run any preprocessor and update_nav.sh was still there, so I didn't notice @wilzbach.
https://gist.github.com/MartinNowak/a471fe7ddbfeef205cdf04c93a94c6d0#file-release-sh-L77
I've seen the change though, but also I don't think it was on stable.

@MartinNowak
Copy link
Member Author

For reference #2159.

@MartinNowak
Copy link
Member Author

Seems like I still need to call update_nav to update the navigation ;).

@wilzbach
Copy link
Contributor

wilzbach commented Feb 7, 2018

I've seen the change though, but also I don't think it was on stable.

Yeah, sorry. I was commenting from my phone and there's it always hard to search for PRs with their bulky mobile UI.

Seems like I still need to call update_nav to update the navigation ;).

Ah sorry. Yeah, maybe I can make it obsolete for the next release ;-)

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.

3 participants