diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-12-19 22:16:38 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-12-19 22:16:38 +1100 |
| commit | df0a62acbe00b40737c60c2a7c7726d34bed187a (patch) | |
| tree | 1de1810f1eeaeed80a00c0734fc0cf658efc85cc | |
| parent | 4da8ddacad8a1e2f35e8e5178e7bedf23f70cb69 (diff) | |
| download | gitlab-ce-psimyn-diff-discussion-vue-storybook.tar.gz | |
prevent empty <tr>psimyn-diff-discussion-vue-storybook
| -rw-r--r-- | app/assets/javascripts/notes/components/diff_with_note.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/diff_with_note.vue b/app/assets/javascripts/notes/components/diff_with_note.vue index 435eb3aca81..f1cf2a530b1 100644 --- a/app/assets/javascripts/notes/components/diff_with_note.vue +++ b/app/assets/javascripts/notes/components/diff_with_note.vue @@ -63,7 +63,8 @@ class="diff-content code js-syntax-highlight" > <table> - <tr + <component + :is="html.className ? 'tr' : 'template'" :class="html.className" v-for="html in diffRows" v-html="html.outerHTML" diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index 72066f21c1d..9a9f39c0d83 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -91,7 +91,7 @@ return '#'; // FIXME }, isDiffDiscussion() { - return (this.discussion.diff_discussion && this.discussion.diff_file); + return (this.diff_discussion && this.diff_file); }, wrapperComponent() { if (this.isDiffDiscussion) { |