diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 15:09:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 15:09:45 +0000 |
| commit | aaf59610548d9b0fd01acfd50e831cbe519ecba2 (patch) | |
| tree | b6505abedcd965ebae5118b504b185b63129dc4c /app/assets/javascripts/notes | |
| parent | 1363ca12f1f07c634647cf55c4c16b7401098673 (diff) | |
| download | gitlab-ce-aaf59610548d9b0fd01acfd50e831cbe519ecba2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/diff_with_note.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/components/note_edited_text.vue | 2 |
2 files changed, 2 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 fe22737c7fc..c3915ef299b 100644 --- a/app/assets/javascripts/notes/components/diff_with_note.vue +++ b/app/assets/javascripts/notes/components/diff_with_note.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* 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'; diff --git a/app/assets/javascripts/notes/components/note_edited_text.vue b/app/assets/javascripts/notes/components/note_edited_text.vue index 1af5af5c470..7c052320c98 100644 --- a/app/assets/javascripts/notes/components/note_edited_text.vue +++ b/app/assets/javascripts/notes/components/note_edited_text.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue'; export default { |