diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-01-19 11:15:12 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-01-19 11:15:12 -0600 |
| commit | 069937d35a5ab07fb830912531709dc4200aed3b (patch) | |
| tree | 7a74adf70ccc213ec82625cc7b97ba99ba6512e7 | |
| parent | 3090012dbdceb2f59ffa706ee71e7f4952451a35 (diff) | |
| download | gitlab-ce-069937d35a5ab07fb830912531709dc4200aed3b.tar.gz | |
Resolve incorrect conflict resolution for dispatcher cluster pages
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index b1e4980a8a3..6305b55642b 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -554,9 +554,12 @@ import ProjectVariables from './project_variables'; case 'projects:clusters:show': case 'projects:clusters:update': case 'projects:clusters:destroy': - import('./pages/projects/clusters/show') - .then(callDefault) - .catch(fail); + 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; + }); break; case 'projects:clusters:index': import(/* webpackChunkName: "clusters_index" */ './clusters/clusters_index') |