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.

Sign up for GitHub

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

Accept custom configs #725

Closed
wants to merge 22 commits into from
Closed

Accept custom configs #725

wants to merge 22 commits into from

Commits on Jan 2, 2013

  1. added custom config file 

    Signed-off-by: Parker Moore <parkrmoore@gmail.com>
    @StefanLiebenberg @parkr
    StefanLiebenberg authored and parkr committed Jan 2, 2013
    Copy the full SHA
    b15c0cd View commit details
    Browse the repository at this point in the history

  2. Moved --config block to below importer switches

    @parkr
    parkr committed Jan 2, 2013
    Copy the full SHA
    30acc87 View commit details
    Browse the repository at this point in the history

  3. Raise error if no config file is passed to --config

    @parkr
    parkr committed Jan 2, 2013
    Copy the full SHA
    daf33e5 View commit details
    Browse the repository at this point in the history

  4. Tests for --config

    @parkr
    parkr committed Jan 2, 2013
    Copy the full SHA
    d0e2a0a View commit details
    Browse the repository at this point in the history

  5. Using default config if config passed is either empty or null

    @parkr
    parkr committed Jan 2, 2013
    1
    Copy the full SHA
    ac9a541 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2013

  1. Added the missing '>'

    @parkr
    parkr committed Jan 16, 2013
    Copy the full SHA
    939d633 View commit details
    Browse the repository at this point in the history

  2. Fixed merge conflict

    @parkr
    parkr committed Jan 16, 2013
    Copy the full SHA
    283e45d View commit details
    Browse the repository at this point in the history

  3. Tests for --config

    @parkr
    parkr committed Jan 16, 2013
    Copy the full SHA
    3e1c171 View commit details
    Browse the repository at this point in the history

  4. Using default config if config passed is either empty or null

    @parkr
    parkr committed Jan 16, 2013
    Copy the full SHA
    61bf277 View commit details
    Browse the repository at this point in the history

  5. Added the missing '>'

    @parkr
    parkr committed Jan 16, 2013
    Copy the full SHA
    6203306 View commit details
    Browse the repository at this point in the history

  6. Merged bin/jekyll

    @parkr
    parkr committed Jan 16, 2013
    Copy the full SHA
    a47387a View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2013

  1. Merge pull request #855 from danielgrieve/remove-ruby-version 

    ignore .ruby-version
    @parkr
    parkr committed Mar 13, 2013
    Copy the full SHA
    98b37a5 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2013

  1. Bump version to 1.0.0.pre.

    @parkr
    parkr committed Mar 14, 2013
    Copy the full SHA
    dbc356f View commit details
    Browse the repository at this point in the history

  2. Release 1.0.0.pre

    @parkr
    parkr committed Mar 14, 2013
    Copy the full SHA
    7ba7328 View commit details
    Browse the repository at this point in the history

  3. Updated version and gemspec to reflect 1.0.0.beta1 release

    @parkr
    parkr committed Mar 14, 2013
    Copy the full SHA
    5c35a84 View commit details
    Browse the repository at this point in the history

  4. Release 1.0.0.beta1

    @parkr
    parkr committed Mar 14, 2013
    Copy the full SHA
    bc67372 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2013

  1. Renamed test under wrong name.

    @parkr
    parkr committed Mar 16, 2013
    Copy the full SHA
    b49bba9 View commit details
    Browse the repository at this point in the history

  2. Rebase on master

    @parkr
    parkr committed Mar 16, 2013
    Copy the full SHA
    9a222b1 View commit details
    Browse the repository at this point in the history

  3. Tests for --config

    @parkr
    parkr committed Mar 16, 2013
    Copy the full SHA
    19a1198 View commit details
    Browse the repository at this point in the history

  4. Using default config if config passed is either empty or null

    @parkr
    parkr committed Mar 16, 2013
    Copy the full SHA
    2f11cf3 View commit details
    Browse the repository at this point in the history

  5. Added the missing '>'

    @parkr
    parkr committed Mar 16, 2013
    Copy the full SHA
    0c0fc69 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'accept-custom-config' of github.com:mojombo/jekyll into… 

    … accept-custom-config

* 'accept-custom-config' of github.com:mojombo/jekyll:
  Added the missing '>'
  Using default config if config passed is either empty or null
  Tests for --config
  Fixed merge conflict
  Added the missing '>'
  Using default config if config passed is either empty or null
  Tests for --config
  Raise error if no config file is passed to --config
  Moved --config block to below importer switches
  added custom config file
    @parkr
    parkr committed Mar 16, 2013
    Copy the full SHA
    409bdac View commit details
    Browse the repository at this point in the history