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.

Sign up for GitHub

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

fix(glimmer): {{else}}{{#if}} into {{else if}} merging #6080

Merged
merged 4 commits into from May 2, 2019
Merged

fix(glimmer): {{else}}{{#if}} into {{else if}} merging #6080

merged 4 commits into from May 2, 2019

Commits on May 1, 2019

  1. Highlight the nested if / else issue 

    ```
{{#if a}}
  a
{{else}}
  {{#if c}}
    c
  {{/if}}
  e
{{/if}}
```
should be left untouched. Instead, it is turned into:
```
{{#if a}}
  a
{{else if c}}
  c
e
{{/if}}
```
    @dcyriller
    dcyriller committed May 1, 2019
    Copy the full SHA
    19a61c5 View commit details
    Browse the repository at this point in the history

  2. Fix {{else}}{{#if}} into {{else if}} merging

    @dcyriller
    dcyriller committed May 1, 2019
    Copy the full SHA
    2e5dfe1 View commit details
    Browse the repository at this point in the history

  3. Add CHANGELOG note

    @dcyriller
    dcyriller committed May 1, 2019
    Copy the full SHA
    b407ef4 View commit details
    Browse the repository at this point in the history

  4. Trigger CI

    @dcyriller
    dcyriller committed May 1, 2019
    Copy the full SHA
    32e7493 View commit details
    Browse the repository at this point in the history