Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue18
1 files changed, 11 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue
index e5688091cc7..6d7ec607557 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue
@@ -1,17 +1,23 @@
<script>
import { s__ } from '~/locale';
+import BoldText from '~/vue_merge_request_widget/components/bold_text.vue';
import StateContainer from '../state_container.vue';
import { DETAILED_MERGE_STATUS } from '../../constants';
export default {
i18n: {
- approvalNeeded: s__('mrWidget|Merge blocked: all required approvals must be given.'),
+ approvalNeeded: s__(
+ 'mrWidget|%{boldStart}Merge blocked:%{boldEnd} all required approvals must be given.',
+ ),
blockingMergeRequests: s__(
- 'mrWidget|Merge blocked: you can only merge after the above items are resolved.',
+ 'mrWidget|%{boldStart}Merge blocked:%{boldEnd} you can only merge after the above items are resolved.',
+ ),
+ externalStatusChecksFailed: s__(
+ 'mrWidget|%{boldStart}Merge blocked:%{boldEnd} all status checks must pass.',
),
- externalStatusChecksFailed: s__('mrWidget|Merge blocked: all status checks must pass.'),
},
components: {
+ BoldText,
StateContainer,
},
props: {
@@ -38,10 +44,8 @@ export default {
<template>
<state-container :mr="mr" status="failed">
- <span
- class="gl-ml-3 gl-font-weight-bold gl-w-100 gl-flex-grow-1 gl-md-mr-3 gl-ml-0! gl-text-body!"
- >
- {{ failedText }}
+ <span class="gl-ml-3 gl-w-100 gl-flex-grow-1 gl-md-mr-3 gl-ml-0! gl-text-body!">
+ <bold-text :message="failedText" />
</span>
</state-container>
</template>