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.

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

fix error with variable as file name #1613

Merged
merged 1 commit into from Oct 4, 2013

Conversation

Projects
None yet
4 participants
@maul-esel
Contributor

maul-esel commented Oct 4, 2013

Recently merged PR #1495 conflicted with PR #1490, this conflict was incorrectly "resolved" by me when rebasing, resulting in failures on travis-CI, as indicated by @sferik.

Problem was, #1490 went and validated the file name when the tag was created. However, it failed for variable syntax. Now, this PR fixes the validation to be performed after the variable was resolved.

@sferik

This comment has been minimized.

Contributor

sferik commented Oct 4, 2013

👍 Looks good to me.

@parkr

This comment has been minimized.

Member

parkr commented Oct 4, 2013

👍 Thanks, @maul-esel!

parkr added a commit that referenced this pull request Oct 4, 2013

Merge pull request #1613 from maul-esel/fix-variable-include
fix error with variable as file name

@parkr parkr merged commit b850c01 into jekyll:master Oct 4, 2013

1 check was pending

default The Travis CI build is in progress
Details

@maul-esel maul-esel deleted the maul-esel:fix-variable-include branch Oct 4, 2013

parkr added a commit that referenced this pull request Oct 4, 2013

@maul-esel

This comment has been minimized.

Contributor

maul-esel commented Oct 4, 2013

You're welcome, and sorry my contributions are so error-prone recently.

@parkr

This comment has been minimized.

Member

parkr commented Oct 4, 2013

Not a problem! There are a lot of changes all at the same time and it becomes difficult to deal with the collisions between various features and enhancements :)

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