diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 18:08:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 18:08:44 +0300 |
commit | 120f4aaedc8fe830a3f572491d240d8ee6addefb (patch) | |
tree | a2138baa55dfa67d292fb1a83ce686ee7f5d10a5 /app/assets/javascripts/pages | |
parent | 729e3765d5feb762df1ccfbc228a8dd4662aa3f9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages')
3 files changed, 10 insertions, 4 deletions
diff --git a/app/assets/javascripts/pages/admin/application_settings/integrations/index.js b/app/assets/javascripts/pages/admin/application_settings/integrations/index.js new file mode 100644 index 00000000000..2e61eedd185 --- /dev/null +++ b/app/assets/javascripts/pages/admin/application_settings/integrations/index.js @@ -0,0 +1,6 @@ +import PersistentUserCallout from '~/persistent_user_callout'; + +document.addEventListener('DOMContentLoaded', () => { + const callout = document.querySelector('.js-admin-integrations-moved'); + PersistentUserCallout.factory(callout); +}); diff --git a/app/assets/javascripts/pages/projects/snippets/show/index.js b/app/assets/javascripts/pages/projects/snippets/show/index.js index d8fbb851ffb..e49d46ea97b 100644 --- a/app/assets/javascripts/pages/projects/snippets/show/index.js +++ b/app/assets/javascripts/pages/projects/snippets/show/index.js @@ -3,7 +3,7 @@ import ZenMode from '~/zen_mode'; import LineHighlighter from '~/line_highlighter'; import BlobViewer from '~/blob/viewer'; import snippetEmbed from '~/snippet/snippet_embed'; -import initSnippetsApp from '~/snippets'; +import { SnippetShowInit } from '~/snippets'; document.addEventListener('DOMContentLoaded', () => { if (!gon.features.snippetsVue) { @@ -13,7 +13,7 @@ document.addEventListener('DOMContentLoaded', () => { new ZenMode(); // eslint-disable-line no-new snippetEmbed(); } else { - initSnippetsApp(); + SnippetShowInit(); initNotes(); } }); diff --git a/app/assets/javascripts/pages/snippets/show/index.js b/app/assets/javascripts/pages/snippets/show/index.js index 3bc9d4f957f..9a463b4762b 100644 --- a/app/assets/javascripts/pages/snippets/show/index.js +++ b/app/assets/javascripts/pages/snippets/show/index.js @@ -3,7 +3,7 @@ import BlobViewer from '~/blob/viewer'; import ZenMode from '~/zen_mode'; import initNotes from '~/init_notes'; import snippetEmbed from '~/snippet/snippet_embed'; -import initSnippetsApp from '~/snippets'; +import { SnippetShowInit } from '~/snippets'; document.addEventListener('DOMContentLoaded', () => { if (!gon.features.snippetsVue) { @@ -13,7 +13,7 @@ document.addEventListener('DOMContentLoaded', () => { new ZenMode(); // eslint-disable-line no-new snippetEmbed(); } else { - initSnippetsApp(); + SnippetShowInit(); initNotes(); } }); |