BigW Consortium Gitlab

Commit 069937d3 by Eric Eastwood

Resolve incorrect conflict resolution for dispatcher cluster pages

parent 3090012d
...@@ -554,9 +554,12 @@ import ProjectVariables from './project_variables'; ...@@ -554,9 +554,12 @@ import ProjectVariables from './project_variables';
case 'projects:clusters:show': case 'projects:clusters:show':
case 'projects:clusters:update': case 'projects:clusters:update':
case 'projects:clusters:destroy': case 'projects:clusters:destroy':
import('./pages/projects/clusters/show') import(/* webpackChunkName: "clusters" */ './clusters/clusters_bundle')
.then(callDefault) .then(cluster => new cluster.default()) // eslint-disable-line new-cap
.catch(fail); .catch((err) => {
Flash(s__('ClusterIntegration|Problem setting up the cluster'));
throw err;
});
break; break;
case 'projects:clusters:index': case 'projects:clusters:index':
import(/* webpackChunkName: "clusters_index" */ './clusters/clusters_index') import(/* webpackChunkName: "clusters_index" */ './clusters/clusters_index')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment