Forward-port: Configuration permalink fix and addition of Configuration.from and sorting `site.collections` by label #4942

Merged
merged 19 commits into from May 25, 2016

Conversation

Projects
None yet
4 participants
@pathawks
Member

pathawks commented May 24, 2016

Merge #4910 into master
#4911

parkr and others added some commits Apr 4, 2016

Add Configuration.from & use in Jekyll.configuration.
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)
@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr May 25, 2016

Member

Yay!!! Thanks so much, @pathawks! ❤️

@jekyllbot: merge +port

Member

parkr commented May 25, 2016

Yay!!! Thanks so much, @pathawks! ❤️

@jekyllbot: merge +port

@jekyllbot jekyllbot merged commit cf810a8 into jekyll:master May 25, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

jekyllbot added a commit that referenced this pull request May 25, 2016

@parkr parkr referenced this pull request May 25, 2016

Closed

Port changes in v3.1.4 & v3.1.5 & v3.1.6 forward #4911

8 of 8 tasks complete

parkr added a commit that referenced this pull request May 25, 2016

Merge branch 'master' into pathawks-fp/jsonify-drops
* 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.
  ...

@pathawks pathawks deleted the pathawks:fp/configuration-from-permalink-fix branch May 26, 2016

@joeyhoer

This comment has been minimized.

Show comment
Hide comment
@joeyhoer

joeyhoer Aug 6, 2016

@parkr @pathawks Was removing the override line intentional? It seems to have affected guard-jekyll-plus imathis/guard-jekyll-plus#51. I'm wondering if this is something that should be resolved in the extension or here.

@parkr @pathawks Was removing the override line intentional? It seems to have affected guard-jekyll-plus imathis/guard-jekyll-plus#51. I'm wondering if this is something that should be resolved in the extension or here.

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