convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files #4786
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
| @@ -41,7 +41,7 @@ def read_yaml(base, name, opts = {}) | |||
| begin | |||
| self.content = File.read(site.in_source_dir(base, name), | |||
| Utils.merged_file_read_opts(site, opts)) | |||
| if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m | |||
| if content =~ Document::YAML_FRONT_MATTER_REGEXP | |||
There was a problem hiding this comment.
This is only used in Convertible, why is on Document if it's only used here?
|
|
|
😄 @jekyllbot: merge +bug |
jekyllbot
added a commit
that referenced
this pull request
Apr 15, 2016
parkr
added a commit
that referenced
this pull request
Apr 21, 2016
* master: (58 commits) Update history to reflect merge of #4792 [ci skip] Update history to reflect merge of #4793 [ci skip] Update history to reflect merge of #4804 [ci skip] Update history to reflect merge of #4754 [ci skip] Update history to reflect merge of #4813 [ci skip] Added missing single quote on rsync client side command Add v3.0.4 and v3.1.3 to the history. Fixed typo Add jekyll-autoprefixer plugin Explicitly require Filters rather than implicitly. Update history to reflect merge of #4786 [ci skip] Update history to reflect merge of #4789 [ci skip] updates example domain in config template Globalize Jekyll's Filters. Update JRuby to 9.0.5.0; Drop the double digit test. Update Rack-Jekyll Heroku deployment blog post url convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files Update history to reflect merge of #4734 [ci skip] Update history to reflect merge of #4478 [ci skip] Fix rubocop warning. ...
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.
Replaces #4736, which was my commit in a PR but with some git conflict.
/cc @jekyll/build