diff options
| author | Sean Nichols <git@seanich.com> | 2018-12-13 23:52:13 -0500 |
|---|---|---|
| committer | Sean Nichols <git@seanich.com> | 2018-12-13 23:52:31 -0500 |
| commit | 9f9eb03f3d8247438523a9fee3a83967fecd8114 (patch) | |
| tree | bc86be888301dcc5935d9254ea75b1792176f27b /app/assets | |
| parent | ece6df18f88fd51015bb8adac1da68f944eafdfe (diff) | |
| download | gitlab-ce-9f9eb03f3d8247438523a9fee3a83967fecd8114.tar.gz | |
Fix diff table rendering for empty files and improve tests
Diffstat (limited to 'app/assets')
| -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 452938a2200..98997b522d9 100644 --- a/app/assets/javascripts/diffs/components/diff_content.vue +++ b/app/assets/javascripts/diffs/components/diff_content.vue @@ -74,12 +74,12 @@ export default { <template v-if="isTextFile"> <empty-file-viewer v-if="diffFile.empty" /> <inline-diff-view - v-if="isInlineView" + v-else-if="isInlineView" :diff-file="diffFile" :diff-lines="diffFile.highlighted_diff_lines || []" /> <parallel-diff-view - v-if="isParallelView" + v-else-if="isParallelView" :diff-file="diffFile" :diff-lines="diffFile.parallel_diff_lines || []" /> |