diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-12-28 10:28:38 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-12-28 10:28:38 +0000 |
| commit | 11f8a97f4a53b0f9bd2271d8dee02e7b5cfe252b (patch) | |
| tree | c19e0872572308da980cfa8c50cb292b2ce61f94 /app/assets | |
| parent | 4d6fe39a69373b199ed0897fcd7e10296d8d1121 (diff) | |
| parent | 5a3e6fdff96f50cb293a8c9fe64ccbf59619936f (diff) | |
| download | gitlab-ce-11f8a97f4a53b0f9bd2271d8dee02e7b5cfe252b.tar.gz | |
Merge branch 'fj-fix-lfs-image-comments-diffs' into 'master'
Fix bug commenting LFS images and displaying LFS files
Closes #43783
See merge request gitlab-org/gitlab-ce!23812
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_content.vue | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_content.vue b/app/assets/javascripts/diffs/components/diff_content.vue index 42d09e44768..ba6dcd63880 100644 --- a/app/assets/javascripts/diffs/components/diff_content.vue +++ b/app/assets/javascripts/diffs/components/diff_content.vue @@ -45,6 +45,9 @@ export default { isTextFile() { return this.diffFile.viewer.name === 'text'; }, + errorMessage() { + return this.diffFile.viewer.error; + }, diffFileCommentForm() { return this.getCommentFormForDiffFile(this.diffFile.file_hash); }, @@ -75,7 +78,7 @@ export default { <template> <div class="diff-content"> - <div class="diff-viewer"> + <div v-if="!errorMessage" class="diff-viewer"> <template v-if="isTextFile"> <empty-file-viewer v-if="diffFile.empty" /> <inline-diff-view @@ -129,5 +132,8 @@ export default { </div> </diff-viewer> </div> + <div v-else class="diff-viewer"> + <div class="nothing-here-block" v-html="errorMessage"></div> + </div> </div> </template> |