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
1a31cb2c
Commit
1a31cb2c
authored
Jun 26, 2013
by
Izaak Alpert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update the proc/lamda to be consistent
Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3
parent
089605fe
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
config/initializers/devise.rb
config/initializers/devise.rb
+3
-3
No files found.
config/initializers/devise.rb
View file @
1a31cb2c
...
@@ -207,11 +207,11 @@ Devise.setup do |config|
...
@@ -207,11 +207,11 @@ Devise.setup do |config|
if
Gitlab
.
config
.
ldap
.
enabled
if
Gitlab
.
config
.
ldap
.
enabled
if
Gitlab
.
config
.
ldap
.
allow_username_or_email_login
if
Gitlab
.
config
.
ldap
.
allow_username_or_email_login
email_stripping_proc
=
Proc
.
new
{
|
name
|
name
.
gsub
(
/@.*$/
,
''
)}
email_stripping_proc
=
->
(
name
)
{
name
.
gsub
(
/@.*$/
,
''
)}
else
else
email_stripping_proc
=
lambda
{
|
n
|
n
}
email_stripping_proc
=
->
(
name
)
{
name
}
end
end
config
.
omniauth
:ldap
,
config
.
omniauth
:ldap
,
host:
Gitlab
.
config
.
ldap
[
'host'
],
host:
Gitlab
.
config
.
ldap
[
'host'
],
base:
Gitlab
.
config
.
ldap
[
'base'
],
base:
Gitlab
.
config
.
ldap
[
'base'
],
...
...
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