Fix incorrect conflict resolution for cluster JS

See https://gitlab.com/gitlab-org/release/tasks/issues/45#note_55157005 Bad commit: https://gitlab.com/gitlab-org/gitlab-ee/commit/ce872e0168 What it should look like: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16506/diffs

Fix incorrect conflict resolution for cluster JS
1985b22e · Eric Eastwood · a003e123 · 1985b22e
Commit 1985b22e authored Jan 18, 2018 by Eric Eastwood
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

dispatcher.js app/assets/javascripts/dispatcher.js +2 -0

No files found.
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -561,6 +561,8 @@ import Activities from './activities';
          new DueDateSelectors();
          break;
        case 'projects:clusters:show':
+        case 'projects:clusters:update':
+        case 'projects:clusters:destroy':
          import(/* webpackChunkName: "clusters" */ './clusters/clusters_bundle')
            .then(cluster => new cluster.default()) // eslint-disable-line new-cap
            .catch((err) => {