Ignore subfolders in the _posts folder. #2705
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The merge that is reverted assigned categories to posts based on the subfolders in the _posts directory and was merged under the understanding that it was fixing a bug. Subfolders in the _posts directory should not assign metadata information to posts at this point in time and was not a bug.
|
I only reverted the changes from the original merge. Are there any subsequent changes due to later changes that need to be made? |
| assert_equal "cat2", post.categories[0] | ||
| assert_equal "cat3", post.categories[1] | ||
| end | ||
|
|
There was a problem hiding this comment.
Can we keep this test and ensure that the categories are not added?
There was a problem hiding this comment.
Good idea. I can work on that.
|
Whelp... that didn't work. Let me try again, locally. |
Did you try adding |
|
I already just added some test categories to populate the category array. Would you prefer I do it the other way? |
|
This will work – I'll merge this and push up a fix for how categories are added after. Thanks! |
parkr
added a commit
that referenced
this pull request
Aug 7, 2014
parkr
added a commit
that referenced
this pull request
Aug 7, 2014
|
👍 🍺 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts only the changes made in #2633
It was performed by running
git revert -m 1 18c033dc5c00b2ce0b3528cb310bf3988377e39fand manually solving the merge conflict to preserve later changes.