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
06590b91
Commit
06590b91
authored
Mar 02, 2015
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Be sure that admin_group exists before trying to check for user membership.
parent
1a0ce115
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
lib/gitlab/ldap/access.rb
lib/gitlab/ldap/access.rb
+3
-1
No files found.
lib/gitlab/ldap/access.rb
View file @
06590b91
...
@@ -110,7 +110,9 @@ module Gitlab
...
@@ -110,7 +110,9 @@ module Gitlab
def
update_admin_status
def
update_admin_status
admin_group
=
Gitlab
::
LDAP
::
Group
.
find_by_cn
(
ldap_config
.
admin_group
,
adapter
)
admin_group
=
Gitlab
::
LDAP
::
Group
.
find_by_cn
(
ldap_config
.
admin_group
,
adapter
)
if
admin_group
.
has_member?
(
Gitlab
::
LDAP
::
Person
.
find_by_dn
(
user
.
ldap_identity
.
extern_uid
,
adapter
))
admin_user
=
Gitlab
::
LDAP
::
Person
.
find_by_dn
(
user
.
ldap_identity
.
extern_uid
,
adapter
)
if
admin_group
&&
admin_group
.
has_member?
(
admin_user
)
unless
user
.
admin?
unless
user
.
admin?
user
.
admin
=
true
user
.
admin
=
true
user
.
save
user
.
save
...
...
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