Fix deep_merge_hashes! handling of drops and hashes #4359

Merged
merged 3 commits into from Jan 15, 2016

Conversation

Projects
None yet
3 participants
@parkr
Member

parkr commented Jan 15, 2016

Closes #4334.
Fixes #4326.

One of the last pieces before v3.1.

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jan 15, 2016

Member

@envygeeks do you know why that kramdown test is failing again? Maybe enable_coderay isn't being merged properly?

Member

parkr commented Jan 15, 2016

@envygeeks do you know why that kramdown test is failing again? Maybe enable_coderay isn't being merged properly?

@parkr parkr added the fix label Jan 15, 2016

@parkr parkr added this to the 3.1 milestone Jan 15, 2016

@envygeeks

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks Jan 15, 2016

Contributor

enable_coderay isn't merged, it's detected and coderay shipped from highlighter. The only way it would fail (since head was fixed) now is if there is a persistence problem.

Contributor

envygeeks commented Jan 15, 2016

enable_coderay isn't merged, it's detected and coderay shipped from highlighter. The only way it would fail (since head was fixed) now is if there is a persistence problem.

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jan 15, 2016

Member

@jekyllbot: merge +bug

Member

parkr commented Jan 15, 2016

@jekyllbot: merge +bug

@jekyllbot jekyllbot closed this Jan 15, 2016

@jekyllbot jekyllbot deleted the optimize-drop branch Jan 15, 2016

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

@parkr parkr restored the optimize-drop branch Jan 15, 2016

@parkr parkr reopened this Jan 15, 2016

parkr added a commit that referenced this pull request Jan 15, 2016

Merge pull request #4359 from jekyll/optimize-drop
Fix deep_merge_hashes! handling of drops and hashes

@parkr parkr merged commit 15a2dac into master Jan 15, 2016

1 check passed

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

@parkr parkr deleted the optimize-drop branch Jan 15, 2016

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jan 15, 2016

Member

So weird, @jekyllbot.

Member

parkr commented Jan 15, 2016

So weird, @jekyllbot.

@parkr parkr referenced this pull request Jul 19, 2016

Closed

Collection items are always rendered with the default layout #5111

5 of 17 tasks complete

@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.