Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-08-24 00:10:54 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-08-24 00:10:54 +0300
commite79ee0307dfccb48871ee77ac3ebf6ae6a48117e (patch)
tree62397323948e0e50e0ae7c2bdecce8cd8b855a3d /app/assets/javascripts/merge_request_tabs.js
parent6a6e9bec88480863cc3e8fb5edc50744e00da964 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r--app/assets/javascripts/merge_request_tabs.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index 09fe611262c..f0f141c8961 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('~/commit/pipelines/pipelines_table_wrapper.vue')
+ : import('~/commit/pipelines/pipelines_table.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) {