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

convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files #4786

Merged
merged 1 commit into from Apr 15, 2016

Conversation

Projects
None yet
3 participants
@parkr
Member

parkr commented Apr 14, 2016

Replaces #4736, which was my commit in a PR but with some git conflict.

/cc @jekyll/build

@parkr parkr added the enhancement label Apr 14, 2016

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

This comment has been minimized.

@envygeeks

envygeeks Apr 14, 2016

Contributor

This is only used in Convertible, why is on Document if it's only used here?

@envygeeks

envygeeks Apr 14, 2016

Contributor

This is only used in Convertible, why is on Document if it's only used here?

This comment has been minimized.

@envygeeks

envygeeks Apr 14, 2016

Contributor

Take that back.

@envygeeks

envygeeks Apr 14, 2016

Contributor

Take that back.

This comment has been minimized.

@parkr

parkr Apr 14, 2016

Member

You're OK with it then?

@parkr

parkr Apr 14, 2016

Member

You're OK with it then?

This comment has been minimized.

@envygeeks

envygeeks Apr 14, 2016

Contributor

I see no problem.

@envygeeks

envygeeks Apr 14, 2016

Contributor

I see no problem.

@envygeeks

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks Apr 14, 2016

Contributor

:shipit:

Contributor

envygeeks commented Apr 14, 2016

:shipit:

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Apr 15, 2016

Member

😄

@jekyllbot: merge +bug

Member

parkr commented Apr 15, 2016

😄

@jekyllbot: merge +bug

@jekyllbot jekyllbot merged commit f922e89 into master Apr 15, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jekyllbot jekyllbot deleted the convertible-use-doc-frontmatter-regexp branch Apr 15, 2016

jekyllbot added a commit that referenced this pull request Apr 15, 2016

parkr added a commit that referenced this pull request Apr 21, 2016

Merge branch 'master' into themes
* 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 join this conversation on GitHub. Already have an account? Sign in to comment