Skip to content
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

Jump to bottom

Re-implement handling Liquid blocks in excerpts #7250

Merged
merged 5 commits into from Nov 4, 2018
Merged

Re-implement handling Liquid blocks in excerpts #7250

merged 5 commits into from Nov 4, 2018

Commits on Sep 16, 2018

  1. Re-implement handling Liquid blocks in excerpts

    @ashmaroli
    ashmaroli committed Sep 16, 2018
    Copy the full SHA
    d46fdd6 View commit details
    Browse the repository at this point in the history

  2. fix regexps and update warning message

    @ashmaroli
    ashmaroli committed Sep 16, 2018
    Copy the full SHA
    8f97bf5 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2018

  1. base LIQUID_TAG_REGEX on upstream regex 

    ref: Liquid::BlockBody::FullToken
https://git.io/fAyaY
    @ashmaroli
    ashmaroli committed Sep 18, 2018
    Copy the full SHA
    e1d6db0 View commit details
    Browse the repository at this point in the history

  2. print warning only if excerpt has been modified

    @ashmaroli
    ashmaroli committed Sep 18, 2018
    Copy the full SHA
    61831d4 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2018

  1. Merge upstream 'master' into this branch

    @ashmaroli
    ashmaroli committed Nov 4, 2018
    Copy the full SHA
    55f164c View commit details
    Browse the repository at this point in the history