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
Boxiang Sun
gitlab-ce
Commits
b229b0f0
Commit
b229b0f0
authored
Oct 14, 2014
by
Jan-Willem van der Meer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix authorization for LDAP login
parent
23b692c7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
lib/gitlab/ldap/access.rb
lib/gitlab/ldap/access.rb
+4
-0
lib/gitlab/ldap/user.rb
lib/gitlab/ldap/user.rb
+1
-1
No files found.
lib/gitlab/ldap/access.rb
View file @
b229b0f0
...
@@ -45,6 +45,10 @@ module Gitlab
...
@@ -45,6 +45,10 @@ module Gitlab
def
adapter
def
adapter
@adapter
||=
Gitlab
::
LDAP
::
Adapter
.
new
(
provider
)
@adapter
||=
Gitlab
::
LDAP
::
Adapter
.
new
(
provider
)
end
end
def
ldap_config
Gitlab
::
LDAP
::
Config
.
new
(
provider
)
end
end
end
end
end
end
end
lib/gitlab/ldap/user.rb
View file @
b229b0f0
...
@@ -30,7 +30,7 @@ module Gitlab
...
@@ -30,7 +30,7 @@ module Gitlab
def
find_by_uid_and_provider
def
find_by_uid_and_provider
self
.
class
.
find_by_uid_and_provider
(
self
.
class
.
find_by_uid_and_provider
(
auth_hash
.
provider
,
auth_hash
.
uid
.
downcase
)
auth_hash
.
uid
.
downcase
,
auth_hash
.
provider
)
end
end
def
find_by_email
def
find_by_email
...
...
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