Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
7b0e93fe
Commit
7b0e93fe
authored
May 21, 2019
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve CE/EE diffs in signin box
Part of single codebase changes.
parent
e63b65cd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
app/views/devise/shared/_signin_box.html.haml
app/views/devise/shared/_signin_box.html.haml
+6
-2
No files found.
app/views/devise/shared/_signin_box.html.haml
View file @
7b0e93fe
...
@@ -3,17 +3,21 @@
...
@@ -3,17 +3,21 @@
.login-box.tab-pane
{
id:
"crowd"
,
role:
'tabpanel'
,
class:
active_when
(
form_based_auth_provider_has_active_class?
(
:crowd
))
}
.login-box.tab-pane
{
id:
"crowd"
,
role:
'tabpanel'
,
class:
active_when
(
form_based_auth_provider_has_active_class?
(
:crowd
))
}
.login-body
.login-body
=
render
'devise/sessions/new_crowd'
=
render
'devise/sessions/new_crowd'
=
render_if_exists
'devise/sessions/new_kerberos_tab'
-
@ldap_servers
.
each_with_index
do
|
server
,
i
|
-
@ldap_servers
.
each_with_index
do
|
server
,
i
|
.login-box.tab-pane
{
id:
"#{server['provider_name']}"
,
role:
'tabpanel'
,
class:
active_when
(
i
.
zero?
&&
form_based_auth_provider_has_active_class?
(
:ldapmain
))
}
.login-box.tab-pane
{
id:
"#{server['provider_name']}"
,
role:
'tabpanel'
,
class:
active_when
(
i
.
zero?
&&
form_based_auth_provider_has_active_class?
(
:ldapmain
))
}
.login-body
.login-body
=
render
'devise/sessions/new_ldap'
,
server:
server
=
render
'devise/sessions/new_ldap'
,
server:
server
=
render_if_exists
'devise/sessions/new_smartcard'
-
if
password_authentication_enabled_for_web?
-
if
password_authentication_enabled_for_web?
.login-box.tab-pane
{
id:
'login-pane'
,
role:
'tabpanel'
}
.login-box.tab-pane
{
id:
'login-pane'
,
role:
'tabpanel'
}
.login-body
.login-body
=
render
'devise/sessions/new_base'
=
render
'devise/sessions/new_base'
=
render_if_exists
'devise/sessions/new_smartcard'
-
elsif
password_authentication_enabled_for_web?
-
elsif
password_authentication_enabled_for_web?
.login-box.tab-pane.active
{
id:
'login-pane'
,
role:
'tabpanel'
}
.login-box.tab-pane.active
{
id:
'login-pane'
,
role:
'tabpanel'
}
.login-body
.login-body
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment