Add Utils.merged_file_read_opts to unify reading & strip the BOM #4404

Merged
merged 1 commit into from Jan 29, 2016

Conversation

Projects
None yet
3 participants
@parkr
Member

parkr commented Jan 27, 2016

This might fix #2853.

/cc @jekyll/core for review.

@parkr parkr added this to the 3.1.1 milestone Jan 27, 2016

@parkr parkr changed the title from Page#dir: ensure it ends in a slash to Add Utils.merged_file_read_opts to unify reading & strip the BOM Jan 27, 2016

@parkr parkr added the fix label Jan 27, 2016

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jan 27, 2016

Member

@envygeeks Nokogiri seems to be crapping out again.

Failure:
TestKramdown#test_: kramdown should render fenced code blocks with syntax highlighting.  [/home/travis/build/jekyll/jekyll/test/test_kramdown.rb:60]
Minitest::Assertion: Failed refutation, no message given

Restarting the build seems to fix it.

Member

parkr commented Jan 27, 2016

@envygeeks Nokogiri seems to be crapping out again.

Failure:
TestKramdown#test_: kramdown should render fenced code blocks with syntax highlighting.  [/home/travis/build/jekyll/jekyll/test/test_kramdown.rb:60]
Minitest::Assertion: Failed refutation, no message given

Restarting the build seems to fix it.

@envygeeks

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks Jan 27, 2016

Contributor

I'll remove Nokogiri tomorrow afternoon in favor of static testing.

Contributor

envygeeks commented Jan 27, 2016

I'll remove Nokogiri tomorrow afternoon in favor of static testing.

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jan 29, 2016

Member

@jekyllbot: merge +bug

Member

parkr commented Jan 29, 2016

@jekyllbot: merge +bug

jekyllbot added a commit that referenced this pull request Jan 29, 2016

@jekyllbot jekyllbot merged commit 00d7536 into master Jan 29, 2016

1 check passed

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

@jekyllbot jekyllbot deleted the bom-it branch Jan 29, 2016

jekyllbot added a commit that referenced this pull request Jan 29, 2016

@jekyll jekyll locked and limited conversation to collaborators Feb 27, 2017

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