diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue index 66af0c5a83e..24cd9d6428d 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue @@ -1,10 +1,6 @@ <script> import { GlTooltipDirective, GlLink } from '@gitlab/ui'; import Icon from '~/vue_shared/components/icon.vue'; -import { - OPTIONAL, - OPTIONAL_CAN_APPROVE, -} from '~/vue_merge_request_widget/components/approvals/messages'; export default { components: { @@ -25,17 +21,12 @@ export default { default: '', }, }, - computed: { - message() { - return this.canApprove ? OPTIONAL_CAN_APPROVE : OPTIONAL; - }, - }, }; </script> <template> <div class="d-flex align-items-center"> - <span class="text-muted">{{ message }}</span> + <span class="text-muted">{{ s__('mrWidget|Approval is optional') }}</span> <gl-link v-if="canApprove && helpPath" v-gl-tooltip |