diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 18:09:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 18:09:45 +0300 |
commit | aaf59610548d9b0fd01acfd50e831cbe519ecba2 (patch) | |
tree | b6505abedcd965ebae5118b504b185b63129dc4c /app/assets/javascripts/mr_popover | |
parent | 1363ca12f1f07c634647cf55c4c16b7401098673 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/mr_popover')
-rw-r--r-- | app/assets/javascripts/mr_popover/components/mr_popover.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/mr_popover/components/mr_popover.vue b/app/assets/javascripts/mr_popover/components/mr_popover.vue index bbc2feae812..e6bf7a6ec02 100644 --- a/app/assets/javascripts/mr_popover/components/mr_popover.vue +++ b/app/assets/javascripts/mr_popover/components/mr_popover.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { GlPopover, GlSkeletonLoading } from '@gitlab/ui'; import CiIcon from '../../vue_shared/components/ci_icon.vue'; import timeagoMixin from '../../vue_shared/mixins/timeago'; @@ -8,7 +8,7 @@ import { mrStates, humanMRStates } from '../constants'; export default { // name: 'MRPopover' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25 - name: 'MRPopover', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings + name: 'MRPopover', // eslint-disable-line @gitlab/require-i18n-strings components: { GlPopover, GlSkeletonLoading, @@ -102,11 +102,11 @@ export default { <ci-icon v-if="detailedStatus" :status="detailedStatus" /> </div> <h5 class="my-2">{{ mergeRequestTitle }}</h5> - <!-- eslint-disable @gitlab/vue-i18n/no-bare-strings --> + <!-- eslint-disable @gitlab/vue-require-i18n-strings --> <div class="text-secondary"> {{ `${projectPath}!${mergeRequestIID}` }} </div> - <!-- eslint-enable @gitlab/vue-i18n/no-bare-strings --> + <!-- eslint-enable @gitlab/vue-require-i18n-strings --> </div> </gl-popover> </template> |