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
140d4695
Commit
140d4695
authored
Nov 14, 2016
by
Alejandro Rodríguez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflicts after ce-upstream merge
parent
d5790a20
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
19 deletions
+0
-19
config/initializers/devise.rb
config/initializers/devise.rb
+0
-19
No files found.
config/initializers/devise.rb
View file @
140d4695
...
...
@@ -213,28 +213,9 @@ Devise.setup do |config|
end
if
Gitlab
::
LDAP
::
Config
.
enabled?
<<<<<<<
HEAD
Gitlab
::
LDAP
::
Config
.
servers
.
each
do
|
server
|
if
server
[
'allow_username_or_email_login'
]
email_stripping_proc
=
->
(
name
)
{
name
.
gsub
(
/@.*\z/
,
''
)}
else
email_stripping_proc
=
->
(
name
)
{
name
}
end
config
.
omniauth
server
[
'provider_name'
],
host:
server
[
'host'
],
base:
server
[
'base'
],
uid:
server
[
'uid'
],
port:
server
[
'port'
],
method:
server
[
'method'
],
bind_dn:
server
[
'bind_dn'
],
password:
server
[
'password'
],
name_proc:
email_stripping_proc
=======
Gitlab
::
LDAP
::
Config
.
providers
.
each
do
|
provider
|
ldap_config
=
Gitlab
::
LDAP
::
Config
.
new
(
provider
)
config
.
omniauth
(
provider
,
ldap_config
.
omniauth_options
)
>>>>>>>
ce
/
master
end
end
...
...
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