diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/javascripts/commit/pipelines/pipelines_bundle.js | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) | |
download | gitlab-ce-859a6fb938bb9ee2a317c46dfa4fcc1af49608f0.tar.gz |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/commit/pipelines/pipelines_bundle.js')
-rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_bundle.js | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js index 24033634aad..920ffde3e32 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js +++ b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import commitPipelinesTable from './pipelines_table.vue'; +import CommitPipelinesTable from './pipelines_table.vue'; /** * Used in: @@ -8,14 +8,6 @@ import commitPipelinesTable from './pipelines_table.vue'; * - Merge Request details View > Pipelines Tab > Pipelines Table (projects:merge_requests:show) * - New Merge Request View > Pipelines Tab > Pipelines Table (projects:merge_requests:creations:new) */ - -const CommitPipelinesTable = Vue.extend(commitPipelinesTable); - -// export for use in merge_request_tabs.js (TODO: remove this hack when we understand how to load -// vue.js in merge_request_tabs.js) -window.gl = window.gl || {}; -window.gl.CommitPipelinesTable = CommitPipelinesTable; - export default () => { const pipelineTableViewEl = document.querySelector('#commit-pipeline-table-view'); @@ -34,13 +26,17 @@ export default () => { }); if (pipelineTableViewEl.dataset.disableInitialization === undefined) { - const table = new CommitPipelinesTable({ - propsData: { - endpoint: pipelineTableViewEl.dataset.endpoint, - helpPagePath: pipelineTableViewEl.dataset.helpPagePath, - emptyStateSvgPath: pipelineTableViewEl.dataset.emptyStateSvgPath, - errorStateSvgPath: pipelineTableViewEl.dataset.errorStateSvgPath, - autoDevopsHelpPath: pipelineTableViewEl.dataset.helpAutoDevopsPath, + const table = new Vue({ + render(createElement) { + return createElement(CommitPipelinesTable, { + props: { + endpoint: pipelineTableViewEl.dataset.endpoint, + helpPagePath: pipelineTableViewEl.dataset.helpPagePath, + emptyStateSvgPath: pipelineTableViewEl.dataset.emptyStateSvgPath, + errorStateSvgPath: pipelineTableViewEl.dataset.errorStateSvgPath, + autoDevopsHelpPath: pipelineTableViewEl.dataset.helpAutoDevopsPath, + }, + }); }, }).$mount(); pipelineTableViewEl.appendChild(table.$el); |