diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-01-18 11:25:40 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-01-18 11:25:40 -0600 |
| commit | 1985b22e2bd0698f0c6f8669998b5f3efa490b9f (patch) | |
| tree | bba783602ccb8d2396922801c1119cb836bf2302 | |
| parent | a003e123d115b6c3e62389060a813cea0ed25923 (diff) | |
| download | gitlab-ce-1985b22e2bd0698f0c6f8669998b5f3efa490b9f.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 42f61d33f6e..8253475cf52 100644 --- 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) => { |