diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-11 12:07:59 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-11 12:07:59 +0300 |
commit | 27ad9b4c89456548d3eaa380a8ab7cc7380f34c3 (patch) | |
tree | f88951664b3ca62d5288d0c01d14da4e667981f1 /app/assets/javascripts/vue_merge_request_widget | |
parent | 134681224f2caef1404bf0ec2712bb7d86df7532 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue | 8 | ||||
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue index b75f2dce54e..f5667aee15b 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue @@ -70,7 +70,9 @@ export default { <template v-if="isCollapsed"> <slot name="header"></slot> <gl-button - variant="link" + category="tertiary" + variant="confirm" + size="small" data-testid="mr-collapsible-title" :disabled="isLoading" :class="{ 'border-0': isLoading }" @@ -81,7 +83,9 @@ export default { </template> <gl-button v-else - variant="link" + category="tertiary" + variant="confirm" + size="small" data-testid="mr-collapsible-title" :disabled="isLoading" :class="{ 'border-0': isLoading }" diff --git a/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js index ce5ba976574..627ddb0445e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js +++ b/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js @@ -1,8 +1,6 @@ import { __ } from '~/locale'; -export const MERGE_DISABLED_TEXT = __( - 'Merge blocked: all merge request dependencies must be merged or closed.', -); +export const MERGE_DISABLED_TEXT = __('You can only merge once the items above are resolved.'); export const MERGE_DISABLED_SKIPPED_PIPELINE_TEXT = __( "Merge blocked: pipeline must succeed. It's waiting for a manual job to continue.", ); |