Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix deep_merge_hashes! handling of drops and hashes #4359

Merged
merged 3 commits into from Jan 15, 2016
Merged

Fix deep_merge_hashes! handling of drops and hashes #4359

merged 3 commits into from Jan 15, 2016

Conversation

parkr
Copy link
Member

@parkr parkr commented Jan 15, 2016

Closes #4334.
Fixes #4326.

One of the last pieces before v3.1.

@parkr
Copy link
Member Author

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
Copy link
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.

@parkr
Copy link
Member Author

parkr commented Jan 15, 2016

@jekyllbot: merge +bug

@jekyllbot jekyllbot closed this Jan 15, 2016
@jekyllbot jekyllbot deleted the optimize-drop branch January 15, 2016 23:06
jekyllbot added a commit that referenced this pull request Jan 15, 2016
@jekyllbot
Update history to reflect merge of #4359 [ci skip]
04e1768
@parkr parkr restored the optimize-drop branch January 15, 2016 23:19
@parkr parkr reopened this Jan 15, 2016
parkr added a commit that referenced this pull request Jan 15, 2016
@parkr
Merge pull request #4359 from jekyll/optimize-drop
15a2dac 
Fix deep_merge_hashes! handling of drops and hashes
@parkr parkr merged commit 15a2dac into master Jan 15, 2016
@parkr parkr deleted the optimize-drop branch January 15, 2016 23:19
@parkr
Copy link
Member Author

parkr commented Jan 15, 2016

So weird, @jekyllbot.

@parkr parkr mentioned this pull request Jul 19, 2016
Closed
17 tasks
@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.
Reviewers
No reviews
Assignees
No one assigned
Labels
fix frozen-due-to-age
Projects
None yet
Milestone
3.1
Development

Successfully merging this pull request may close these issues.

Jekyll master _still_ not playing nicely with jekyll-archives
3 participants
@parkr @envygeeks @jekyllbot