Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 0 deletions

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 1e07469bd7a..8fb973b1c1f 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -36,6 +36,7 @@ import initSearchAutocomplete from './search_autocomplete';
 import GlFieldErrors from './gl_field_errors';
 import initUserPopovers from './user_popovers';
 import initBroadcastNotifications from './broadcast_notification';
+import PersistentUserCallout from './persistent_user_callout';
 import { initUserTracking } from './tracking';
 import { __ } from './locale';
 
@@ -108,6 +109,9 @@ function deferredInitialisation() {
   initUserTracking();
   initBroadcastNotifications();
 
+  const recoverySettingsCallout = document.querySelector('.js-recovery-settings-callout');
+  PersistentUserCallout.factory(recoverySettingsCallout);
+
   if (document.querySelector('.search')) initSearchAutocomplete();
 
   addSelectOnFocusBehaviour('.js-select-on-focus');