diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 12:09:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 12:09:26 +0000 |
| commit | 2e4c4055181eec9186458dd5dd3219c937032ec7 (patch) | |
| tree | eee59e7124ffcf093f1b53369436c69cfe4d9cc5 /app/assets/javascripts/notes/components | |
| parent | 97f0ae7454597105a27df65ffb772949d9d4f3cb (diff) | |
| download | gitlab-ce-2e4c4055181eec9186458dd5dd3219c937032ec7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes/components')
| -rw-r--r-- | app/assets/javascripts/notes/components/diff_with_note.vue | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/diff_with_note.vue b/app/assets/javascripts/notes/components/diff_with_note.vue index a58a040fb4e..cd5cfc09ea0 100644 --- a/app/assets/javascripts/notes/components/diff_with_note.vue +++ b/app/assets/javascripts/notes/components/diff_with_note.vue @@ -1,5 +1,4 @@ <script> -/* eslint-disable @gitlab/vue-require-i18n-strings */ import { mapState, mapActions } from 'vuex'; import { GlSkeletonLoading } from '@gitlab/ui'; import DiffFileHeader from '~/diffs/components/diff_file_header.vue'; @@ -96,7 +95,7 @@ export default { <td class="old_line diff-line-num"></td> <td class="new_line diff-line-num"></td> <td v-if="error" class="js-error-lazy-load-diff diff-loading-error-block"> - {{ error }} Unable to load the diff + {{ __('Unable to load the diff') }} <button class="btn-link btn-link-retry btn-no-padding js-toggle-lazy-diff-retry-button" @click="fetchDiff" |