diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-07-08 15:13:03 +0300 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-07-09 15:23:30 +0300 |
| commit | 931de6c27d09a9d75d2a503e7fc701d22648cf99 (patch) | |
| tree | a53c99d89f3786f9dc3e0130f4830e04d896f4d1 /app | |
| parent | aad7eeb5e37ab2a3fb894b9f5cc325929e1ad023 (diff) | |
Merge branch '48897-mr-refactor-parallel-and-diff-view-are-being-rendered-at-the-same-time' into 'master'
Resolve "MR refactor: parallel and diff view are being rendered at the same time"
Closes #48897
See merge request gitlab-org/gitlab-ce!20440
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_content.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_content.vue b/app/assets/javascripts/diffs/components/diff_content.vue index b6af49c7e2e..e9f24b7277e 100644 --- a/app/assets/javascripts/diffs/components/diff_content.vue +++ b/app/assets/javascripts/diffs/components/diff_content.vue @@ -39,12 +39,12 @@ export default { <div class="diff-viewer"> <template v-if="isTextFile"> <inline-diff-view - v-show="isInlineView" + v-if="isInlineView" :diff-file="diffFile" :diff-lines="diffFile.highlightedDiffLines || []" /> <parallel-diff-view - v-show="isParallelView" + v-if="isParallelView" :diff-file="diffFile" :diff-lines="diffFile.parallelDiffLines || []" /> |