diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 21:07:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 21:07:34 +0300 |
| commit | 04af78083ec8cfabc6bba6604855b1c7c4de04f2 (patch) | |
| tree | b2c85abc260461a694dc00a379112f1b2ad6531d /app/assets/javascripts/vue_merge_request_widget | |
| parent | 63414b32fd0e75477285df4603e9f7b31dffa955 (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/mr_widget_options.vue | 3 |
1 files changed, 1 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 4bdb1eb40b6..af69416387a 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 @@ -544,6 +544,7 @@ export default { <mr-widget-pipeline-container v-if="shouldRenderPipelines" :mr="mr" /> <mr-widget-approvals v-if="shouldRenderApprovals" :mr="mr" :service="service" /> <report-widget-container> + <widget-container v-if="mr && shouldShowSecurityExtension" :mr="mr" /> <extensions-container v-if="hasExtensions" :mr="mr" /> <security-reports-app v-if="shouldRenderSecurityReport && !shouldShowSecurityExtension" @@ -580,8 +581,6 @@ export default { </mr-widget-alert-message> </div> - <widget-container v-if="mr" :mr="mr" /> - <div class="mr-widget-section" data-qa-selector="mr_widget_content"> <component :is="componentName" :mr="mr" :service="service" /> <ready-to-merge |