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
2c8ee981
Commit
2c8ee981
authored
Jul 31, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
We can collect user groups now
parent
7ba37d86
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
3 deletions
+17
-3
lib/gitlab/ldap/group.rb
lib/gitlab/ldap/group.rb
+2
-2
lib/gitlab/ldap/person.rb
lib/gitlab/ldap/person.rb
+15
-1
No files found.
lib/gitlab/ldap/group.rb
View file @
2c8ee981
...
@@ -31,8 +31,6 @@ module Gitlab
...
@@ -31,8 +31,6 @@ module Gitlab
end
.
compact
end
.
compact
end
end
private
def
member_uids
def
member_uids
if
entry
.
respond_to?
:memberuid
if
entry
.
respond_to?
:memberuid
entry
.
memberuid
entry
.
memberuid
...
@@ -43,6 +41,8 @@ module Gitlab
...
@@ -43,6 +41,8 @@ module Gitlab
end
.
compact
end
.
compact
end
end
private
def
member_dns
def
member_dns
if
entry
.
respond_to?
:member
if
entry
.
respond_to?
:member
entry
.
member
entry
.
member
...
...
lib/gitlab/ldap/person.rb
View file @
2c8ee981
...
@@ -21,15 +21,29 @@ module Gitlab
...
@@ -21,15 +21,29 @@ module Gitlab
entry
.
cn
.
join
(
" "
)
entry
.
cn
.
join
(
" "
)
end
end
def
u
sername
def
u
id
entry
.
uid
.
join
(
" "
)
entry
.
uid
.
join
(
" "
)
end
end
def
username
uid
end
def
groups
adapter
.
groups
.
select
do
|
group
|
group
.
member_uids
.
include?
(
uid
)
end
end
private
private
def
entry
def
entry
@entry
@entry
end
end
def
adapter
@adapter
||=
Gitlab
::
LDAP
::
Adapter
.
new
end
end
end
end
end
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