diff options
| author | Sean Nichols <git@seanich.com> | 2018-12-08 01:31:47 -0500 |
|---|---|---|
| committer | Sean Nichols <git@seanich.com> | 2018-12-11 23:49:04 -0500 |
| commit | e6a3898e907d9e211415e298e521e87da584ca66 (patch) | |
| tree | 7f5ec58e3cb29394560171fa401c1c5b79c1c471 | |
| parent | 05dcb2dd76f2a9890398543f6de1516f5ec0b379 (diff) | |
| download | gitlab-ce-e6a3898e907d9e211415e298e521e87da584ca66.tar.gz | |
Fix Prettier formatting and add MR to changelog
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_file.vue | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/54786-mr-empty-file-display.yml | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index d397ffbefe3..836f1af881c 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -176,9 +176,7 @@ 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 v-if="file.empty" class="nothing-here-block">{{ __('Empty file') }}</div> </div> </template> diff --git a/changelogs/unreleased/54786-mr-empty-file-display.yml b/changelogs/unreleased/54786-mr-empty-file-display.yml index b2ee9069234..5adf5744755 100644 --- a/changelogs/unreleased/54786-mr-empty-file-display.yml +++ b/changelogs/unreleased/54786-mr-empty-file-display.yml @@ -1,5 +1,5 @@ --- title: Display empty files properly on MR diffs -merge_request: +merge_request: 23671 author: Sean Nichols type: fixed |