diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-11-08 07:58:45 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-11-08 07:58:45 +0000 |
| commit | cd5ddc4f2e3088a906417741a019292479ab84a6 (patch) | |
| tree | d7deeb2234938180fda92f17ebcfad22611fd07f /app/assets/javascripts/diffs | |
| parent | b5a79f15369678fd959e6db290e2f29eab3ca84c (diff) | |
| download | gitlab-ce-cd5ddc4f2e3088a906417741a019292479ab84a6.tar.gz | |
Discussions redesign
Diffstat (limited to 'app/assets/javascripts/diffs')
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_discussions.vue | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_discussions.vue b/app/assets/javascripts/diffs/components/diff_discussions.vue index e19207bdc95..b9de487a737 100644 --- a/app/assets/javascripts/diffs/components/diff_discussions.vue +++ b/app/assets/javascripts/diffs/components/diff_discussions.vue @@ -76,7 +76,6 @@ export default { <noteable-discussion v-show="isExpanded(discussion)" :discussion="discussion" - :render-header="false" :render-diff-file="false" :always-expanded="true" :discussions-by-diff-order="true" diff --git a/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue index 3339c56cbb6..3b71c0a1fd4 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue @@ -76,8 +76,9 @@ export default { :class="className" class="notes_holder" > - <td class="notes_line old"></td> - <td class="notes_content parallel old"> + <td + class="notes_content parallel old" + colspan="2"> <div v-if="shouldRenderDiscussionsOnLeft" class="content" @@ -95,8 +96,9 @@ export default { line-position="left" /> </td> - <td class="notes_line new"></td> - <td class="notes_content parallel new"> + <td + class="notes_content parallel new" + colspan="2"> <div v-if="shouldRenderDiscussionsOnRight" class="content" |