diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-17 09:59:32 +0000 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-01-19 14:22:30 +0000 |
| commit | 89a17180d4089808c4457cae35719742bd0eb08f (patch) | |
| tree | 3e06e52755d3f0691fa9e724ffabb380473b8805 | |
| parent | fb26d040f06061015d515383e4777d001a171186 (diff) | |
| download | gitlab-ce-89a17180d4089808c4457cae35719742bd0eb08f.tar.gz | |
Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' into 'master'
Fix JS bundle not running on the Cluster update/destroy pages -- CE backport
Closes gitlab-ee#4378
See merge request gitlab-org/gitlab-ce!16506
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 11 | ||||
| -rw-r--r-- | changelogs/unreleased-ee/4378-fix-cluster-js-not-running-on-update-page.yml | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 678af8f7b7a..b1e4980a8a3 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -552,12 +552,11 @@ import ProjectVariables from './project_variables'; new DueDateSelectors(); break; case 'projects:clusters:show': - import(/* webpackChunkName: "clusters" */ './clusters/clusters_bundle') - .then(cluster => new cluster.default()) // eslint-disable-line new-cap - .catch((err) => { - Flash(s__('ClusterIntegration|Problem setting up the cluster')); - throw err; - }); + case 'projects:clusters:update': + case 'projects:clusters:destroy': + import('./pages/projects/clusters/show') + .then(callDefault) + .catch(fail); break; case 'projects:clusters:index': import(/* webpackChunkName: "clusters_index" */ './clusters/clusters_index') diff --git a/changelogs/unreleased-ee/4378-fix-cluster-js-not-running-on-update-page.yml b/changelogs/unreleased-ee/4378-fix-cluster-js-not-running-on-update-page.yml new file mode 100644 index 00000000000..bbb6cbd05be --- /dev/null +++ b/changelogs/unreleased-ee/4378-fix-cluster-js-not-running-on-update-page.yml @@ -0,0 +1,5 @@ +--- +title: Fix JavaScript bundle running on Cluster update/destroy pages +merge_request: +author: +type: fixed |