diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-04 15:10:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-04 15:10:22 +0300 |
commit | eef37e3313a4f3413633d043e08d85020246ed5e (patch) | |
tree | fdd0834ef6c46343af13137e1aa49fd8faf9a69c /app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | |
parent | 191020103bd4d2aad99c62a35201c05d9df74f8f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 3ac1e881658..c98dc426224 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -91,6 +91,7 @@ export default { MrWidgetApprovals, SecurityReportsApp: () => import('~/vue_shared/security_reports/security_reports_app.vue'), MergeChecksFailed: () => import('./components/states/merge_checks_failed.vue'), + ReadyToMerge: ReadyToMergeState, }, apollo: { state: { @@ -213,6 +214,9 @@ export default { window.gon?.features?.refactorMrWidgetsExtensionsUser ); }, + isRestructuredMrWidgetEnabled() { + return window.gon?.features?.restructuredMrWidget; + }, }, watch: { 'mr.machineValue': { @@ -547,12 +551,17 @@ export default { <div class="mr-widget-section"> <component :is="componentName" :mr="mr" :service="service" /> - - <div class="mr-widget-info"> + <ready-to-merge + v-if="isRestructuredMrWidgetEnabled && mr.commitsCount" + :mr="mr" + :service="service" + /> + <div v-else class="mr-widget-info"> <mr-widget-related-links v-if="shouldRenderRelatedLinks" :state="mr.state" :related-links="mr.relatedLinks" + class="mr-info-list gl-ml-7 gl-pb-5" /> <source-branch-removal-status v-if="shouldRenderSourceBranchRemovalStatus" /> |