diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-17 09:59:32 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-17 09:59:32 +0000 |
| commit | a3b0adb4c856ebd9e8761471c5372f0a10fe8829 (patch) | |
| tree | 6ffb791a217bc6eea30a420416b39084a0210060 | |
| parent | 9b8f51c9d97f7301f236189d262ce253ff612da6 (diff) | |
| parent | 435f0a134a1072999bd0f4d52378609cef76ee1d (diff) | |
| download | gitlab-ce-a3b0adb4c856ebd9e8761471c5372f0a10fe8829.tar.gz | |
Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' into 'master'
Fix JS bundle not running on the Cluster update/destroy pages -- CE backport
Closes gitlab-ee#4378
See merge request gitlab-org/gitlab-ce!16506
| -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 3a7532345c6..0c784084b0d 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -557,6 +557,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 |