deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix few bugs and tests after refactoring ownership logic

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-02 19:32:34 +02:00
parent 00a1f5bc2c
commit d431e43392
19 changed files with 58 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/models/ability.rb
View file

@ -29,21 +29,10 @@ class Ability
rules << project_guest_rules
end
if project.namespace
# If user own project namespace
# (Ex. group owner or account owner)
if project.namespace.owner == user
rules << project_admin_rules
end
else
# For compatibility with global projects
# use projects.owner_id
if project.owner == user
rules << project_admin_rules
end
if project.owner == user
rules << project_admin_rules
end
rules.flatten
end