Skip to content

Upgrade to Jekyll 2.1#75

Merged
benbalter merged 6 commits intomasterfrom
jekyll-2-1
Jul 30, 2014
Merged

Upgrade to Jekyll 2.1#75
benbalter merged 6 commits intomasterfrom
jekyll-2-1

Conversation

@parkr
Copy link
Copy Markdown
Contributor

@parkr parkr commented Jul 1, 2014

http://jekyllrb.com/news/2014/05/06/jekyll-turns-2-0-0/
http://jekyllrb.com/news/2014/06/28/jekyll-turns-21-i-mean-2-1-0/

@parkr parkr mentioned this pull request Jul 1, 2014
8 tasks
@parkr parkr changed the title Jekyll 2.1 Upgrade to Jekyll 2.1 Jul 1, 2014
@rmehner
Copy link
Copy Markdown

rmehner commented Jul 6, 2014

Hey @parkr, thanks for your work. I'd love to use the new Jekyll on GitHub. Is there anything in here you need help with to get this out? To me it looks like that the only two things needed is:

  • change jekyll-versions to v0.1.1 instead of not yet existing v0.1.2
  • change jekyll to v2.1.0 instead of not yet existing v2.1.1

I've checked out your branch and ran the tests and created a new site and all works as expected, but I guess there is a reason why you put in those versions :) So yeah, anything that breaks and where you need help with?

Thanks again!

@rmehner
Copy link
Copy Markdown

rmehner commented Jul 6, 2014

Didn't see the reference above. Sorry for disturbing and enjoy your sunday :)

@parkr
Copy link
Copy Markdown
Contributor Author

parkr commented Jul 6, 2014

@rmehner Absolutely no problem! Help is always kindly accepted where needed -- I really appreciate your offer!

@kdabir
Copy link
Copy Markdown

kdabir commented Jul 10, 2014

Eagerly waiting for GHP to support 2.1.1. Great work guys.

@prbaron
Copy link
Copy Markdown

prbaron commented Jul 21, 2014

Can't wait to see this merged ! Great work on Github Pages guys !

@anjin
Copy link
Copy Markdown

anjin commented Jul 25, 2014

Looking forward to this!

rmehner added a commit to rmehner/jsfest.berlin that referenced this pull request Jul 26, 2014
Reason: We want to make contributing as easy and conflictfree as
possible and there is the chance of people editing the CSS and not the
SCSS which would lead to conflicts as soon as someone else edits the
SCSS again.

Pull request for GitHub support: github/pages-gem#75

/cc @verpixelt & @Dangoo
@parkr parkr mentioned this pull request Jul 29, 2014
We will consider again later.
@benbalter
Copy link
Copy Markdown
Contributor

@parkr what do you think about merging this? I doubt anyone's running the gem off master, and it's a blocker for #80.

@parkr
Copy link
Copy Markdown
Contributor Author

parkr commented Jul 29, 2014

@benbalter I need to fix up the highlight tag and push out a new Jekyll version then we can merge. Would rather have master be what's deployed on Pages. 😄

benbalter added a commit that referenced this pull request Jul 30, 2014
@benbalter benbalter merged commit bd0be76 into master Jul 30, 2014
@benbalter benbalter deleted the jekyll-2-1 branch July 30, 2014 15:56
@le717
Copy link
Copy Markdown

le717 commented Aug 4, 2014

My reaction upon seeing this merged:
Batman dancing

@kleinfreund
Copy link
Copy Markdown

@le717 What just started playing upon opening your comment:

https://soundcloud.com/begin/particles-over-wakefield

Watching a gif movie for 2:41now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants