Merge branch '13634-broadcast-message' into 'master'

Fix broadcast message not showing up on login page

Closes #13634

See merge request gitlab-org/gitlab-ce!15578

app/assets/stylesheets/pages/login.scss

@@ -252,6 +252,10 @@
       background: $white-light;
     }
 
+    .login-page-broadcast {
+      margin-top: 50px;
+    }
+
     .navless-container {
       padding: 65px 15px; // height of footer + bottom padding of email confirmation link
 

app/views/layouts/devise.html.haml

@@ -4,7 +4,8 @@
   %body.ui_charcoal.login-page.application.navless{ data: { page: body_data_page } }
     .page-wrap
       = render "layouts/header/empty"
-      = render "layouts/broadcast"
+      .login-page-broadcast
+        = render "layouts/broadcast"
       .container.navless-container
         .content
           = render "layouts/flash"

changelogs/unreleased/13634-broadcast-message.yml

+---
+title: Fix broadcast message not showing up on login page
+merge_request: 15578
+author:
+type: fixed