summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-30 11:40:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-30 11:40:20 +0000
commitbca6156a17d74b80aac39d8c1a39094e5f8915d6 (patch)
tree25dfd2e6d48e40612c077335a8d057e4c991072d /app/assets
parentf37a805b0b472824349e747cf1f44f802363d126 (diff)
downloadgitlab-ce-bca6156a17d74b80aac39d8c1a39094e5f8915d6.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-12-stable-ee
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/vue_shared/components/diff_viewer/viewers/not_diffable.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/not_diffable.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/not_diffable.vue
index d4d3038f066..5a6b1c19027 100644
--- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/not_diffable.vue
+++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/not_diffable.vue
@@ -1,5 +1,5 @@
<template>
<div class="nothing-here-block">
- {{ __('This diff was suppressed by a .gitattributes entry.') }}
+ {{ __("File suppressed by a .gitattributes entry or the file's encoding is unsupported.") }}
</div>
</template>