Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #6945 #6970

Merged
merged 1 commit into from May 1, 2018
Merged

Backport #6945 #6970

merged 1 commit into from May 1, 2018

Conversation

pathawks
Copy link
Member

This backports #6945 to 3.8-stable

@pathawks pathawks requested review from a team April 30, 2018 23:55
@pathawks
Copy link
Member Author

pathawks commented May 1, 2018

@jekyllbot: merge +fix

@pathawks
Copy link
Member Author

pathawks commented May 1, 2018

Oh, is Travis not building branches that aren't master?

Shouldn't be a problem:

jekyll/.travis.yml

Lines 29 to 33 in eea203c

branches:
only:
- master
- themes
- /*-stable/

@pathawks
Copy link
Member Author

pathawks commented May 1, 2018

@jekyllbot: merge +fix

@jekyllbot jekyllbot merged commit a89bba3 into 3.8-stable May 1, 2018
@jekyllbot jekyllbot deleted the backport-6945 branch May 1, 2018 00:49
jekyllbot added a commit that referenced this pull request May 1, 2018
@pathawks
Copy link
Member Author

pathawks commented May 1, 2018

Just disabled Travis checks for now. If somebody can figure out how to get it all working, please jump in

@pathawks
Copy link
Member Author

pathawks commented May 1, 2018

Does @jekyllbot not update History for *-stable branches?

Oh no! It updated master. Well, 💩.

pathawks pushed a commit that referenced this pull request May 1, 2018
@pathawks
Copy link
Member Author

pathawks commented May 1, 2018

It looks like, in the past, I just updated History manually and did not merge with @jekyllbot:

#6453

@ashmaroli ashmaroli added the ⏪ backport Changes will be merged into an older stable branch label May 1, 2018
@pathawks pathawks mentioned this pull request May 1, 2018
5 tasks
@jekyll jekyll locked and limited conversation to collaborators Jul 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug 🐛 fix frozen-due-to-age ⏪ backport Changes will be merged into an older stable branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants