diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/assets/javascripts/projects/compare/index.js | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/assets/javascripts/projects/compare/index.js')
-rw-r--r-- | app/assets/javascripts/projects/compare/index.js | 43 |
1 files changed, 6 insertions, 37 deletions
diff --git a/app/assets/javascripts/projects/compare/index.js b/app/assets/javascripts/projects/compare/index.js index 322dff773b8..e485a086d39 100644 --- a/app/assets/javascripts/projects/compare/index.js +++ b/app/assets/javascripts/projects/compare/index.js @@ -1,44 +1,9 @@ import Vue from 'vue'; import CompareApp from './components/app.vue'; -import CompareAppLegacy from './components/app_legacy.vue'; export default function init() { const el = document.getElementById('js-compare-selector'); - if (gon.features?.compareRepoDropdown) { - const { - refsProjectPath, - paramsFrom, - paramsTo, - projectCompareIndexPath, - projectMergeRequestPath, - createMrPath, - projectTo, - projectsFrom, - } = el.dataset; - - return new Vue({ - el, - components: { - CompareApp, - }, - render(createElement) { - return createElement(CompareApp, { - props: { - refsProjectPath, - paramsFrom, - paramsTo, - projectCompareIndexPath, - projectMergeRequestPath, - createMrPath, - defaultProject: JSON.parse(projectTo), - projects: JSON.parse(projectsFrom), - }, - }); - }, - }); - } - const { refsProjectPath, paramsFrom, @@ -46,15 +11,17 @@ export default function init() { projectCompareIndexPath, projectMergeRequestPath, createMrPath, + projectTo, + projectsFrom, } = el.dataset; return new Vue({ el, components: { - CompareAppLegacy, + CompareApp, }, render(createElement) { - return createElement(CompareAppLegacy, { + return createElement(CompareApp, { props: { refsProjectPath, paramsFrom, @@ -62,6 +29,8 @@ export default function init() { projectCompareIndexPath, projectMergeRequestPath, createMrPath, + defaultProject: JSON.parse(projectTo), + projects: JSON.parse(projectsFrom), }, }); }, |