diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-09 15:13:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-09 15:13:34 +0300 |
| commit | 0eb9c236888a832407bf0369ce188c4060a35c76 (patch) | |
| tree | 2a5c286dc0df1bbbc3d74fc4e9e97f7a5ef7b0ba /app | |
| parent | 6a407717a9c5ba125989fa3b1f1a3974e36fe258 (diff) | |
Add latest changes from gitlab-org/gitlab@16-2-stable-ee
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/devise/sessions/new.html.haml | 6 | ||||
| -rw-r--r-- | app/views/layouts/devise.html.haml | 2 |
2 files changed, 8 insertions, 0 deletions
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 |