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

Jump to bottom

Adds the collection label to a document's data #2436

Merged
merged 10 commits into from Jun 4, 2014
Merged

Adds the collection label to a document's data #2436

merged 10 commits into from Jun 4, 2014

Commits on May 23, 2014

  1. add collection.label to Document#to_liquid

    Bud Parr committed May 23, 2014
    Copy the full SHA
    f623404 View commit details
    Browse the repository at this point in the history

  2. add label to document section of collections page

    Bud Parr committed May 23, 2014
    Copy the full SHA
    2e2aac5 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2014

  1. Merge pull request #2469 from jekyll/extract-gist-tag

    @parkr
    parkr committed Jun 1, 2014
    Copy the full SHA
    781e606 View commit details
    Browse the repository at this point in the history

  2. Update history to reflect merge of #2469 [ci skip]

    @parkr
    parkr committed Jun 1, 2014
    Copy the full SHA
    7a9bc64 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2014

  1. add collection.label to Document#to_liquid

    Bud Parr committed Jun 2, 2014
    Copy the full SHA
    00ab79b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'documenttoliquid' of https://github.com/budparr/jekyll … 

    …into documenttoliquid

Conflicts:
lib/jekyll/document.rb
    Bud Parr committed Jun 2, 2014
    Copy the full SHA
    69aae64 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'documenttoliquid' of https://github.com/budparr/jekyll … 

    …into documenttoliquid
    Bud Parr committed Jun 2, 2014
    Copy the full SHA
    ff02e12 View commit details
    Browse the repository at this point in the history

  4. change label to collection 

    To make it clear the label is of the document's collection
    Bud Parr committed Jun 2, 2014
    Copy the full SHA
    90bc931 View commit details
    Browse the repository at this point in the history

  5. remove extra space

    Bud Parr committed Jun 2, 2014
    Copy the full SHA
    441ac37 View commit details
    Browse the repository at this point in the history

  6. add test for collection name

    Bud Parr committed Jun 2, 2014
    Copy the full SHA
    dc62247 View commit details
    Browse the repository at this point in the history