diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-06-22 00:23:04 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-06-22 00:23:04 +0300 |
| commit | 94ef69c4d0be1e0b7593f7cf7f81498d7ecfc4e6 (patch) | |
| tree | b799e83b6f857c8c52d67f81b84119ae72494bc9 | |
| parent | b39f968865974a208fb7ebd0e1dfa68dcce7065b (diff) | |
| download | gitlab-ce-94ef69c4d0be1e0b7593f7cf7f81498d7ecfc4e6.tar.gz | |
Fix isBottom parameter of the diff lines to fix folding on parallel view.
| -rw-r--r-- | app/assets/javascripts/diffs/components/inline_diff_view.vue | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/diffs/components/parallel_diff_view.vue | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/inline_diff_view.vue b/app/assets/javascripts/diffs/components/inline_diff_view.vue index 4131aa6191c..6a2684465b2 100644 --- a/app/assets/javascripts/diffs/components/inline_diff_view.vue +++ b/app/assets/javascripts/diffs/components/inline_diff_view.vue @@ -30,6 +30,7 @@ export default { <diff-table-row :diff-file="diffFile" :line="line" + :is-bottom="index + 1 === diffLinesLength" :key="line.lineCode" /> <inline-diff-comment-row diff --git a/app/assets/javascripts/diffs/components/parallel_diff_view.vue b/app/assets/javascripts/diffs/components/parallel_diff_view.vue index f416ce7e6d2..df7325cf111 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_view.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_view.vue @@ -36,9 +36,8 @@ export default { > <diff-table-row :diff-file="diffFile" - :diff-lines="parallelDiffLines" :line="line" - :line-index="index" + :is-bottom="index + 1 === diffLinesLength" :key="index" /> <parallel-diff-comment-row |