diff options
author | Luke Bennett <lbennett@gitlab.com> | 2018-10-12 09:45:50 +0000 |
---|---|---|
committer | Luke Bennett <lbennett@gitlab.com> | 2018-10-12 09:45:50 +0000 |
commit | 06c24d497de3b2e22b1a2fc13ae1cd2cb0100b84 (patch) | |
tree | 4019fab21def0c26bb119167bc6af3b70b648c81 /app/assets/javascripts/pages | |
parent | a5ecb5bbdac05c3b1a96ecb918ce6a4ceed37d75 (diff) | |
download | gitlab-ce-06c24d497de3b2e22b1a2fc13ae1cd2cb0100b84.tar.gz |
Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'"
This reverts merge request !21551
Diffstat (limited to 'app/assets/javascripts/pages')
-rw-r--r-- | app/assets/javascripts/pages/projects/index.js | 6 | ||||
-rw-r--r-- | app/assets/javascripts/pages/root/index.js | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/app/assets/javascripts/pages/projects/index.js b/app/assets/javascripts/pages/projects/index.js index b0345b4e50d..5659e13981a 100644 --- a/app/assets/javascripts/pages/projects/index.js +++ b/app/assets/javascripts/pages/projects/index.js @@ -1,5 +1,5 @@ +import initDismissableCallout from '~/dismissable_callout'; import initGkeDropdowns from '~/projects/gke_cluster_dropdowns'; -import PersistentUserCallout from '../../persistent_user_callout'; import Project from './project'; import ShortcutsNavigation from '../../behaviors/shortcuts/shortcuts_navigation'; @@ -12,9 +12,7 @@ document.addEventListener('DOMContentLoaded', () => { ]; if (newClusterViews.indexOf(page) > -1) { - const callout = document.querySelector('.gcp-signup-offer'); - if (callout) new PersistentUserCallout(callout); // eslint-disable-line no-new - + initDismissableCallout('.gcp-signup-offer'); initGkeDropdowns(); } diff --git a/app/assets/javascripts/pages/root/index.js b/app/assets/javascripts/pages/root/index.js deleted file mode 100644 index 09f8185d3b5..00000000000 --- a/app/assets/javascripts/pages/root/index.js +++ /dev/null @@ -1,5 +0,0 @@ -// if the "projects dashboard" is a user's default dashboard, when they visit the -// instance root index, the dashboard will be served by the root controller instead -// of a dashboard controller. The root index redirects for all other default dashboards. - -import '../dashboard/projects/index'; |