diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-27 12:16:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-27 12:16:04 +0000 |
| commit | 5cb0fa35e709bcd7f9d69e050010e44092a48623 (patch) | |
| tree | 9a10a2a58b3129b6dae59d2aa320f00b1e4a2953 /app/views/admin | |
| parent | 996683657578757cf42ef7478a5c3b9874b312f0 (diff) | |
| download | gitlab-ce-5cb0fa35e709bcd7f9d69e050010e44092a48623.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/sessions/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/sessions/two_factor.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/sessions/new.html.haml b/app/views/admin/sessions/new.html.haml index 04d99657cfd..e9442cf6b53 100644 --- a/app/views/admin/sessions/new.html.haml +++ b/app/views/admin/sessions/new.html.haml @@ -4,7 +4,7 @@ .row.justify-content-center .col-md-5.new-session-forms-container .login-page - #signin-container{ class: "#{'borderless' if Feature.enabled?(:restyle_login_page, @project)}" } + #signin-container{ class: ('borderless' if Feature.enabled?(:restyle_login_page, @project)) } - if any_form_based_providers_enabled? = render 'devise/shared/tabs_ldap', show_password_form: allow_admin_mode_password_authentication_for_web?, render_signup_link: false - else diff --git a/app/views/admin/sessions/two_factor.html.haml b/app/views/admin/sessions/two_factor.html.haml index 65455f2ccf0..d02090d4880 100644 --- a/app/views/admin/sessions/two_factor.html.haml +++ b/app/views/admin/sessions/two_factor.html.haml @@ -4,7 +4,7 @@ .row.justify-content-center .col-md-5.new-session-forms-container .login-page - #signin-container + #signin-container{ class: ('borderless' if Feature.enabled?(:restyle_login_page, @project)) } = render 'devise/shared/tab_single', tab_title: _('Enter Admin Mode') .tab-content .login-box.tab-pane.gl-p-5.active{ id: 'login-pane', role: 'tabpanel' } |