summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/notes/components/diff_with_note.vue3
-rw-r--r--app/assets/javascripts/notes/components/noteable_discussion.vue2
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) {