diff options
| author | Sean Nichols <git@seanich.com> | 2018-12-12 23:07:49 -0500 |
|---|---|---|
| committer | Sean Nichols <git@seanich.com> | 2018-12-12 23:07:49 -0500 |
| commit | 4ae1591b9768f8f727048ff83f675fe99a10eb90 (patch) | |
| tree | 70ae95b9baf7adcf272689c52bf6572f19f0af24 /app | |
| parent | 48d3fff062ca923bfecb9e86b0dc67d2109c36db (diff) | |
| download | gitlab-ce-4ae1591b9768f8f727048ff83f675fe99a10eb90.tar.gz | |
Move empty file message to diff_content component
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_content.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_file.vue | 1 |
2 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 11cc4c09fed..e9e9c8a5ec9 100644 --- a/app/assets/javascripts/diffs/components/diff_content.vue +++ b/app/assets/javascripts/diffs/components/diff_content.vue @@ -69,7 +69,8 @@ export default { <template> <div class="diff-content"> <div class="diff-viewer"> - <template v-if="isTextFile"> + <div v-if="diffFile.empty" class="nothing-here-block">{{ __('Empty file') }}</div> + <template v-else-if="isTextFile"> <inline-diff-view v-if="isInlineView" :diff-file="diffFile" diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 836f1af881c..bed29efb253 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -176,7 +176,6 @@ export default { {{ __('This source diff could not be displayed because it is too large.') }} <span v-html="viewBlobLink"></span> </div> - <div v-if="file.empty" class="nothing-here-block">{{ __('Empty file') }}</div> </div> </template> |