fix error with variable as file name #1613

Merged
merged 1 commit into from Oct 4, 2013

Projects

None yet

3 participants

@maul-esel
Contributor

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
Contributor
sferik commented Oct 4, 2013

👍 Looks good to me.

@parkr
Member
parkr commented Oct 4, 2013

👍 Thanks, @maul-esel!

@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 parkr added a commit that referenced this pull request Oct 4, 2013
@parkr parkr Update history to reflect merge of #1613 55f4c3a
@maul-esel
Contributor

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

@parkr
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 :)

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