diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-01-16 15:47:19 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-01-16 16:01:25 -0600 |
| commit | 435f0a134a1072999bd0f4d52378609cef76ee1d (patch) | |
| tree | c15466f38c85b1b914729f9d3513f240f8450646 | |
| parent | 3228ac06a019c9126b965ff32e354d10011a4f76 (diff) | |
| download | gitlab-ce-ce-backport-4378-fix-cluster-js-not-running-on-update-page.tar.gz | |
Fix JS bundle not running on the Cluster update/destroy pagesce-backport-4378-fix-cluster-js-not-running-on-update-page
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4378
Conflicts:
app/assets/javascripts/dispatcher.js
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased-ee/4378-fix-cluster-js-not-running-on-update-page.yml | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 1c6336073e9..e582a7ba83b 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -559,6 +559,8 @@ import Activities from './activities'; .catch(fail); break; case 'projects:clusters:show': + case 'projects:clusters:update': + case 'projects:clusters:destroy': import('./pages/projects/clusters/show') .then(callDefault) .catch(fail); 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 |