Forward-port: Configuration permalink fix and addition of Configuration.from and sorting site.collections by label
#4942
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This process streamlines the creation of new configurations. Creating a new
site will choke if not all the correct options are given.
Configuration.from will ensure the overrides have all string keys and
ensures all the common issues & defaults are in place so a Site can be
created.
A common use:
config = Configuration.from({ 'permalink' => '/:title/' }) # etc
site = Jekyll::Site.new(config)
…tions'] is modified
|
Yay!!! Thanks so much, @pathawks! ❤️ @jekyllbot: merge +port |
jekyllbot
added a commit
that referenced
this pull request
May 25, 2016
8 tasks
parkr
added a commit
that referenced
this pull request
May 25, 2016
* master: (38 commits) Mention where it came from. [ci skip] Update history to reflect merge of #4944 [ci skip] Update history to reflect merge of #4943 [ci skip] Mention where it came from. [ci skip] Update history to reflect merge of #4942 [ci skip] Update history to reflect merge of #4941 External: remove &block arg, use block_given? Update history to reflect merge of #4936 [ci skip] lib/jekyll.rb: require document_drop to ease our pain Sort the results of the require_all glob. Rubocop fixes Reset {{ layout }} between each render & merge layout data properly Add failing test for layout data inheritance bug (#4433) Add failing test for layout bug (#4897) Fix tests for plugins in configuration. Define Drop#each so we can use the new frozen/duping behavior Don't default 'include' and 'exclude' to an empty array Fix some minor things in the tests Freeze configuration defaults & duplicate in deep_merge_hashes if need be. Remove merge conflicts I forgot to fix. ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge #4910 into master
#4911