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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c832c50c
Commit
c832c50c
authored
Oct 10, 2014
by
Jan-Willem van der Meer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not use primary flag for LDAP servers
parent
5b381868
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
app/views/devise/sessions/new.html.haml
app/views/devise/sessions/new.html.haml
+4
-4
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+0
-1
No files found.
app/views/devise/sessions/new.html.haml
View file @
c832c50c
...
...
@@ -4,14 +4,14 @@
.login-body
-
if
ldap_enabled?
&&
gitlab_config
.
signin_enabled
%ul
.nav.nav-tabs
-
@ldap_servers
.
each
do
|
server
|
%li
{
class:
(
:active
if
server
[
'primary'
]
)}
-
@ldap_servers
.
each
_with_index
do
|
server
,
i
|
%li
{
class:
(
:active
if
i
==
0
)}
=
link_to
server
[
'label'
],
"#tab-
#{
server
.
provider_name
}
"
,
'data-toggle'
=>
'tab'
%li
=
link_to
'Standard'
,
'#tab-signin'
,
'data-toggle'
=>
'tab'
.tab-content
-
@ldap_servers
.
each
do
|
server
|
%div
.tab-pane
{
id:
"tab-#{server.provider_name}"
,
class:
(
:active
if
server
[
'primary'
]
)}
-
@ldap_servers
.
each
_with_index
do
|
server
,
i
|
%div
.tab-pane
{
id:
"tab-#{server.provider_name}"
,
class:
(
:active
if
i
==
0
)}
=
render
'devise/sessions/new_ldap'
,
provider:
server
.
provider_name
%div
#tab-signin
.tab-pane
=
render
'devise/sessions/new_base'
...
...
config/initializers/1_settings.rb
View file @
c832c50c
...
...
@@ -64,7 +64,6 @@ if Settings.ldap['enabled'] || Rails.env.test?
if
Settings
.
ldap
[
'host'
].
present?
excluded_per_server_settings
=
%w(sync_time allow_username_or_email_login)
server
=
Settings
.
ldap
.
except
(
excluded_per_server_settings
)
server
[
'primary'
]
=
true
server
[
'label'
]
=
'LDAP'
server
[
'provider_id'
]
=
''
#providername will be ldap
Settings
.
ldap
[
'servers'
]
=
[
server
]
...
...
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