Forward-port: Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid #4941

Merged
merged 5 commits into from May 25, 2016

Conversation

Projects
None yet
2 participants
@pathawks
Member

pathawks commented May 24, 2016

Merge #4907 into master
#4911

@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks May 24, 2016

Member

Did I do it right? Should I do a separate PR to mirror each PR that needs to be ported forward?

Member

pathawks commented May 24, 2016

Did I do it right? Should I do a separate PR to mirror each PR that needs to be ported forward?

@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks May 24, 2016

Member

I was just using cherry-pick; is there a better way?

Member

pathawks commented May 24, 2016

I was just using cherry-pick; is there a better way?

@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks May 25, 2016

Member

I was just using cherry-pick; is there a better way?

This is what interactive rebase was built for. Someday I will learn to use Git 😜

Member

pathawks commented May 25, 2016

I was just using cherry-pick; is there a better way?

This is what interactive rebase was built for. Someday I will learn to use Git 😜

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr May 25, 2016

Member

LGTM! @pathawks, would you mind rebasing on master? Conflicts :(

Member

parkr commented May 25, 2016

LGTM! @pathawks, would you mind rebasing on master? Conflicts :(

@parkr parkr added the fix label 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 parkr merged commit 48f1697 into jekyll:master May 25, 2016

1 check passed

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

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr May 25, 2016

Member

I can merge manually! Amazing.

Member

parkr commented May 25, 2016

I can merge manually! Amazing.

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

@pathawks pathawks deleted the pathawks:fp/ExcerptDrop branch May 25, 2016

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.
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment