diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-14 15:09:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-14 15:09:48 +0300 |
| commit | 7f73b108d44ebb58d2eddcbc98808bafc94d1b11 (patch) | |
| tree | c44c1d67aefe3a48ce24b1b83ce495edbf57ff25 /app/assets/javascripts/ci | |
| parent | 8f55aaede8e1ba5ca9ffae53313fa860ad05bffa (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ci')
3 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/ci/pipeline_details/pipeline_details_bundle.js b/app/assets/javascripts/ci/pipeline_details/pipeline_details_bundle.js index c4cc6939121..da09852a7f4 100644 --- a/app/assets/javascripts/ci/pipeline_details/pipeline_details_bundle.js +++ b/app/assets/javascripts/ci/pipeline_details/pipeline_details_bundle.js @@ -33,10 +33,16 @@ export default async function initPipelineDetailsBundle() { if (tabsEl) { const { dataset } = tabsEl; + const dismissalDescriptions = JSON.parse(dataset.dismissalDescriptions || '{}'); const { createAppOptions } = await import('ee_else_ce/ci/pipeline_details/pipeline_tabs'); const { createPipelineTabs } = await import('./pipeline_tabs'); const { routes } = await import('ee_else_ce/ci/pipeline_details/routes'); + const securityRoute = routes.find((route) => route.path === '/security'); + if (securityRoute) { + securityRoute.props = { dismissalDescriptions }; + } + const router = new VueRouter({ mode: 'history', base: dataset.pipelinePath, diff --git a/app/assets/javascripts/ci/pipeline_editor/components/file_nav/pipeline_editor_file_nav.vue b/app/assets/javascripts/ci/pipeline_editor/components/file_nav/pipeline_editor_file_nav.vue index da165413341..20b42e26f08 100644 --- a/app/assets/javascripts/ci/pipeline_editor/components/file_nav/pipeline_editor_file_nav.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/file_nav/pipeline_editor_file_nav.vue @@ -52,7 +52,7 @@ export default { }; </script> <template> - <div class="gl-display-flex gl-flex-wrap gl-gap-3"> + <div class="gl-display-flex gl-flex-wrap gl-gap-3 gl-mb-4"> <gl-button v-if="showFileTreeToggle" id="file-tree-toggle" diff --git a/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_header.vue b/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_header.vue index eecf8e42f4b..665ca907ed9 100644 --- a/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_header.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_header.vue @@ -33,7 +33,7 @@ export default { </script> <template> <gl-card - class="gl-new-card gl-mb-3" + class="gl-new-card gl-mb-3 gl-mt-0" header-class="gl-new-card-header" body-class="gl-new-card-body gl-py-4 gl-px-5" > |