diff options
author | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-08-08 09:29:24 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2019-08-08 09:29:24 +0300 |
commit | 834f1f974a80b7747c248752f733c13e0cdfbff8 (patch) | |
tree | cb4df0d2615f9b011c3926ff8f369698f1c4b6d9 /app/assets/javascripts/environments | |
parent | 83f68719a3fc1bdf195863c4a7ed1b69051e5dc5 (diff) |
Disable vue-i18n for non-autofix files
Disables the vue-i18n eslint rules for files
that are not able to be autofixed, this will
stop these offences causing pipeline failures
but they will need manual fixing.
Diffstat (limited to 'app/assets/javascripts/environments')
-rw-r--r-- | app/assets/javascripts/environments/components/environment_item.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/environments/components/stop_environment_modal.vue | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue index 813045cb5e4..95e1e8af9b3 100644 --- a/app/assets/javascripts/environments/components/environment_item.vue +++ b/app/assets/javascripts/environments/components/environment_item.vue @@ -1,4 +1,5 @@ <script> +/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ import { __, sprintf } from '~/locale'; import Timeago from 'timeago.js'; import _ from 'underscore'; @@ -286,9 +287,9 @@ export default { * @returns {Boolean|Undefined} */ isLastDeployment() { - // TODO: when the vue i18n rules are merged need to disable @gitlab/i18n/no-non-i18n-strings // name: 'last?' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives // Vue i18n ESLint rules issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/63560 + // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings return this.model && this.model.last_deployment && this.model.last_deployment['last?']; }, diff --git a/app/assets/javascripts/environments/components/stop_environment_modal.vue b/app/assets/javascripts/environments/components/stop_environment_modal.vue index c78d86e9b97..2cc3412e075 100644 --- a/app/assets/javascripts/environments/components/stop_environment_modal.vue +++ b/app/assets/javascripts/environments/components/stop_environment_modal.vue @@ -1,4 +1,5 @@ <script> +/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ import { GlTooltipDirective } from '@gitlab/ui'; import GlModal from '~/vue_shared/components/gl_modal.vue'; import { s__, sprintf } from '~/locale'; |