From v3.1.4: Fix `{{ layout }}` oddities (proper inheritance & fixing overflow of old data) #4943

Merged
merged 3 commits into from May 25, 2016

Conversation

Projects
None yet
4 participants
@pathawks
Member

pathawks commented May 24, 2016

Merge #4909 into master
#4911

@envygeeks

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks May 25, 2016

Contributor

:shipit:

Contributor

envygeeks commented May 25, 2016

:shipit:

@envygeeks envygeeks added the shipit label May 25, 2016

@parkr parkr changed the title from Forward-port: Fix `{{ layout }}` oddities (proper inheritance & fixing overflow of old data) to From v3.1.4: Fix `{{ layout }}` oddities (proper inheritance & fixing overflow of old data) May 25, 2016

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr May 25, 2016

Member

Wheeee another one!!!! ❤️

@jekyllbot: merge +port

Member

parkr commented May 25, 2016

Wheeee another one!!!! ❤️

@jekyllbot: merge +port

@jekyllbot jekyllbot merged commit 0ca45a4 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 added this to the 3.2 milestone 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/fix-layout-var-overflow branch May 26, 2016

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