diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
commit | 5afcbe03ead9ada87621888a31a62652b10a7e4f (patch) | |
tree | 9918b67a0d0f0bafa6542e839a8be37adf73102d /app/assets/javascripts/merge_request_tabs.js | |
parent | c97c0201564848c1f53226fe19d71fdcc472f7d0 (diff) |
Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 09fe611262c..1bc67522e82 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -93,7 +93,11 @@ function mountPipelines() { const { mrWidgetData } = gl; const table = new Vue({ components: { - CommitPipelinesTable: () => import('~/commit/pipelines/pipelines_table.vue'), + CommitPipelinesTable: () => { + return gon.features.mrPipelinesGraphql + ? import('~/ci/merge_requests/components/pipelines_table_wrapper.vue') + : import('~/commit/pipelines/legacy_pipelines_table_wrapper.vue'); + }, }, apolloProvider, provide: { @@ -103,6 +107,8 @@ function mountPipelines() { fullPath: pipelineTableViewEl.dataset.fullPath, graphqlPath: pipelineTableViewEl.dataset.graphqlPath, manualActionsLimit: 50, + mergeRequestId: mrWidgetData ? mrWidgetData.iid : null, + sourceProjectFullPath: mrWidgetData?.source_project_full_path || '', withFailedJobsDetails: true, }, render(createElement) { @@ -573,10 +579,12 @@ export default class MergeRequestTabs { expandViewContainer() { this.contentWrapper.classList.remove('container-limited'); + this.contentWrapper.classList.add('diffs-container-limited'); } resetViewContainer() { this.contentWrapper.classList.toggle('container-limited', this.isFixedLayoutPreferred); + this.contentWrapper.classList.remove('diffs-container-limited'); } // Expand the issuable sidebar unless the user explicitly collapsed it |