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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
d5ae2bfc
Commit
d5ae2bfc
authored
May 30, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix_ldap_user_filter' into '6-9-stable'
Fix LDAP user filter
parents
13202d82
6d896ed5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
config/initializers/devise.rb
config/initializers/devise.rb
+1
-2
No files found.
config/initializers/devise.rb
View file @
d5ae2bfc
...
@@ -223,7 +223,6 @@ Devise.setup do |config|
...
@@ -223,7 +223,6 @@ Devise.setup do |config|
method:
Gitlab
.
config
.
ldap
[
'method'
],
method:
Gitlab
.
config
.
ldap
[
'method'
],
bind_dn:
Gitlab
.
config
.
ldap
[
'bind_dn'
],
bind_dn:
Gitlab
.
config
.
ldap
[
'bind_dn'
],
password:
Gitlab
.
config
.
ldap
[
'password'
],
password:
Gitlab
.
config
.
ldap
[
'password'
],
filter:
Gitlab
.
config
.
ldap
[
'user_filter'
],
name_proc:
email_stripping_proc
name_proc:
email_stripping_proc
end
end
...
@@ -245,4 +244,4 @@ Devise.setup do |config|
...
@@ -245,4 +244,4 @@ Devise.setup do |config|
config
.
omniauth
provider
[
'name'
].
to_sym
,
*
provider_arguments
config
.
omniauth
provider
[
'name'
].
to_sym
,
*
provider_arguments
end
end
end
end
\ No newline at end of file
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