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

Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' into 'master'
a3b0adb4 · Filipa Lacerda · 9b8f51c9 · 435f0a13 · a3b0adb4 · a3b0adb4
Commit a3b0adb4 authored Jan 17, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

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

4378-fix-cluster-js-not-running-on-update-page.yml ...sed-ee/4378-fix-cluster-js-not-running-on-update-page.yml +5 -0

No files found.
--- 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);

--- 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
+---
+title: Fix JavaScript bundle running on Cluster update/destroy pages
+merge_request:
+author:
+type: fixed