From 0eb9c236888a832407bf0369ce188c4060a35c76 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 9 Aug 2023 12:13:34 +0000
Subject: Add latest changes from gitlab-org/gitlab@16-2-stable-ee

---
 app/views/devise/sessions/new.html.haml | 6 ++++++
 app/views/layouts/devise.html.haml      | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'app')

diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index fd96d5dc1c4..d5f15a72c34 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,7 +1,13 @@
 - page_title _("Sign in")
+
 - content_for :page_specific_javascripts do
   = render "layouts/google_tag_manager_head"
   = render "layouts/one_trust"
+
+- content_for :sessions_broadcast do
+  - unless Gitlab.com?
+    = render "layouts/broadcast"
+
 = render "layouts/google_tag_manager_body"
 
 #signin-container
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 94f25a9f0ae..4e9ae7c7fd8 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -7,6 +7,7 @@
     = header_message
     = render "layouts/init_client_detection_flags"
     - if Feature.enabled?(:restyle_login_page, @project)
+      = yield :sessions_broadcast
       .gl-h-full.borderless.gl-display-flex.gl-flex-wrap
         .container
           .content
@@ -36,6 +37,7 @@
         = render 'devise/shared/footer'
     - else
       = render "layouts/header/empty"
+      = yield :sessions_broadcast
       .gl-h-full.gl-display-flex.gl-flex-wrap
         .container
           .content
-- 
cgit v1.2.3