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
cc768fdd
Commit
cc768fdd
authored
Mar 20, 2014
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reuse LDAP adapter in Group instances
parent
b040f5da
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
lib/gitlab/ldap/adapter.rb
lib/gitlab/ldap/adapter.rb
+1
-1
lib/gitlab/ldap/group.rb
lib/gitlab/ldap/group.rb
+2
-1
No files found.
lib/gitlab/ldap/adapter.rb
View file @
cc768fdd
...
...
@@ -63,7 +63,7 @@ module Gitlab
options
.
merge!
(
size:
size
)
if
size
ldap
.
search
(
options
).
map
do
|
entry
|
Gitlab
::
LDAP
::
Group
.
new
(
entry
)
Gitlab
::
LDAP
::
Group
.
new
(
entry
,
self
)
end
end
...
...
lib/gitlab/ldap/group.rb
View file @
cc768fdd
...
...
@@ -12,9 +12,10 @@ module Gitlab
adapter
.
group
(
cn
)
end
def
initialize
(
entry
)
def
initialize
(
entry
,
adapter
=
nil
)
Rails
.
logger
.
debug
{
"Instantiating
#{
self
.
class
.
name
}
with LDIF:
\n
#{
entry
.
to_ldif
}
"
}
@entry
=
entry
@adapter
=
adapter
end
def
cn
...
...
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