Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 0 deletions

diff --git a/app/assets/javascripts/behaviors/index.js b/app/assets/javascripts/behaviors/index.js
index 1d36661ee63..871b1279ce6 100644
--- a/app/assets/javascripts/behaviors/index.js
+++ b/app/assets/javascripts/behaviors/index.js
@@ -8,6 +8,7 @@ import initCopyAsGFM from './markdown/copy_as_gfm';
 import './quick_submit';
 import './requires_input';
 import initPageShortcuts from './shortcuts';
+import { initToastMessages } from './toasts';
 import './toggler_behavior';
 import './preview_markdown';
 
@@ -21,6 +22,8 @@ initCopyToClipboard();
 initPageShortcuts();
 initCollapseSidebarOnWindowResize();
 
+initToastMessages();
+
 window.requestIdleCallback(
   () => {
     // Check if we have to Load GFM Input
diff --git a/app/assets/javascripts/behaviors/toasts.js b/app/assets/javascripts/behaviors/toasts.js
new file mode 100644
index 00000000000..b6ac78cb540
--- /dev/null
+++ b/app/assets/javascripts/behaviors/toasts.js
@@ -0,0 +1,9 @@
+export async function initToastMessages() {
+  const toasts = document.querySelectorAll('.js-toast-message');
+  if (!toasts.length) {
+    return;
+  }
+
+  const { default: showToast } = await import('~/vue_shared/plugins/global_toast');
+  toasts.forEach((toast) => showToast(toast.dataset.message));
+}