Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid #4907

Merged
merged 7 commits into from May 18, 2016

Conversation

Projects
None yet
2 participants
@parkr
Member

parkr commented May 17, 2016

This fixes the bug in v3.1.3 described in #4906.

@parkr parkr added this to the 3.1.4 milestone May 17, 2016

test/helper.rb
@@ -21,7 +21,7 @@ def jruby?
require 'minitest/reporters'
require 'minitest/profile'
require 'rspec/mocks'
-require 'jekyll'
+require File.expand_path("../lib/jekyll.rb", __dir__)

This comment has been minimized.

@envygeeks

envygeeks May 17, 2016

Contributor

require_relative it's been so long I can't remember but I think it's been there since 1.9 so you should be able to use it.

@envygeeks

envygeeks May 17, 2016

Contributor

require_relative it's been so long I can't remember but I think it's been there since 1.9 so you should be able to use it.

@parkr parkr added the fix label May 17, 2016

parkr added some commits May 17, 2016

Merge branch '3.1-page-excerpt-bug' of github.com:jekyll/jekyll into …
…3.1-page-excerpt-bug

* '3.1-page-excerpt-bug' of github.com:jekyll/jekyll:
  Use require_relative

@parkr parkr merged commit f99ffe5 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-page-excerpt-bug 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