3.1: Configuration permalink fix and addition of Configuration.from and sorting `site.collections` by label #4910

Merged
merged 18 commits into from May 18, 2016

Conversation

Projects
None yet
1 participant
@parkr
Member

parkr commented May 18, 2016

This duplicates #4753 for v3.1. It:

  • Adds Configuration.from, which is a means of creating a Jekyll::Configuration from a hash instead of files
  • Adds ability to overwrite collections.posts.permalink if permalink doesn't work well for it
  • Sorts {{ site.collections }} by label, so iterating gets collections in alphabetical order by name
  • Duplicates #4846 which fixes a bug where Configuration.from would strip watch and other CLI-based options from the configuration.

This targets v3.1.4.

parkr 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 parkr added this to the 3.1.4 milestone May 18, 2016

@parkr parkr added the fix label May 18, 2016

parkr added some commits May 18, 2016

@parkr parkr merged commit 268c4a6 into 3.1-stable May 18, 2016

2 checks passed

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

@parkr parkr deleted the 3.1-configuration-from-permalink-fix branch May 18, 2016

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

@parkr parkr referenced this pull request May 18, 2016

Closed

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

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