diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-21 06:10:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-21 06:10:15 +0300 |
commit | d63d9aebd74436a74f1ff45e26f6565341d5956b (patch) | |
tree | e4b4606da3edb0dd7b7f9d11a119f956890c5e81 /app/assets/javascripts/merge_request_tabs.js | |
parent | 11bda5e7e1637e5b0ace597aafbd45f12b429c32 (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.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 1bc67522e82..03518d5fdd1 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -93,7 +93,7 @@ function mountPipelines() { const { mrWidgetData } = gl; const table = new Vue({ components: { - CommitPipelinesTable: () => { + MergeRequestPipelinesTable: () => { return gon.features.mrPipelinesGraphql ? import('~/ci/merge_requests/components/pipelines_table_wrapper.vue') : import('~/commit/pipelines/legacy_pipelines_table_wrapper.vue'); @@ -112,7 +112,7 @@ function mountPipelines() { withFailedJobsDetails: true, }, render(createElement) { - return createElement('commit-pipelines-table', { + return createElement('merge-request-pipelines-table', { props: { endpoint: pipelineTableViewEl.dataset.endpoint, emptyStateSvgPath: pipelineTableViewEl.dataset.emptyStateSvgPath, @@ -347,11 +347,11 @@ export default class MergeRequestTabs { } // this.hideSidebar(); this.resetViewContainer(); - this.commitPipelinesTable = destroyPipelines(this.commitPipelinesTable); + this.mergeRequestPipelinesTable = destroyPipelines(this.mergeRequestPipelinesTable); } else if (action === 'new') { this.expandView(); this.resetViewContainer(); - this.commitPipelinesTable = destroyPipelines(this.commitPipelinesTable); + this.mergeRequestPipelinesTable = destroyPipelines(this.mergeRequestPipelinesTable); } else if (this.isDiffAction(action)) { if (!isInVueNoteablePage()) { /* @@ -366,7 +366,7 @@ export default class MergeRequestTabs { } // this.hideSidebar(); this.expandViewContainer(); - this.commitPipelinesTable = destroyPipelines(this.commitPipelinesTable); + this.mergeRequestPipelinesTable = destroyPipelines(this.mergeRequestPipelinesTable); this.commitsTab.classList.remove('active'); } else if (action === 'pipelines') { // this.hideSidebar(); @@ -384,7 +384,7 @@ export default class MergeRequestTabs { // this.showSidebar(); this.resetViewContainer(); - this.commitPipelinesTable = destroyPipelines(this.commitPipelinesTable); + this.mergeRequestPipelinesTable = destroyPipelines(this.mergeRequestPipelinesTable); } renderGFM(document.querySelector('.detail-page-description')); @@ -522,7 +522,7 @@ export default class MergeRequestTabs { } mountPipelinesView() { - this.commitPipelinesTable = mountPipelines(); + this.mergeRequestPipelinesTable = mountPipelines(); } // load the diff tab content from the backend |