Skip to content

Accept custom configs #725

Closed
wants to merge 22 commits into from

4 participants

@parkr
Jekyll member
parkr commented Jan 2, 2013

Fixes & tests for #393. Also adds ability to pass in multiple config files which cascade from right to left (later files override earlier files' configs).

@tobi put a great use-case very nicely:

Same here, we run www.shopify.com from a fork that has this merged. We keep _config.yml with the project but also have _config.live.yml which enables things like asset compression and performs some other tasks that are not needed in development environment.

@sl4mmy
sl4mmy commented Jan 2, 2013

I mentioned another use case in #561:

Some sites hosted on GitHub Pages run Jekyll locally in unsafe mode in order to use plugins, and push static HTML up to GitHub Pages where Jekyll is run in safe mode. This feature would simplify setting up such workflows, especially on documentation projects with many contributors.

@parkr parkr was assigned Jan 12, 2013
@mattr-
Jekyll member

missing a > here at the end of the line.

parkr added some commits Jan 15, 2013
@parkr parkr Added the missing '>' 939d633
@parkr parkr Fixed merge conflict 283e45d
@parkr parkr Tests for --config 3e1c171
@parkr parkr Using default config if config passed is either empty or null 61bf277
@parkr parkr Added the missing '>' 6203306
@parkr parkr Merged bin/jekyll a47387a
@parkr parkr Merge pull request #855 from danielgrieve/remove-ruby-version
ignore .ruby-version
98b37a5
@parkr parkr Bump version to 1.0.0.pre. dbc356f
@parkr parkr Release 1.0.0.pre 7ba7328
@parkr parkr Updated version and gemspec to reflect 1.0.0.beta1 release 5c35a84
@parkr parkr Release 1.0.0.beta1 bc67372
@parkr parkr Renamed test under wrong name. b49bba9
@parkr parkr Rebase on master 9a222b1
@parkr parkr Tests for --config 19a1198
@parkr parkr Using default config if config passed is either empty or null 2f11cf3
@parkr parkr Added the missing '>' 0c0fc69
@parkr parkr 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
409bdac
@parkr
Jekyll member
parkr commented Mar 16, 2013

Going to re-submit under a different PR.

@parkr parkr closed this Mar 16, 2013
@parkr parkr deleted the accept-custom-config branch Mar 16, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.