diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-02 19:32:34 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-02 19:32:34 +0200 |
| commit | d431e4339269041784986da40a0e0879baaf96a9 (patch) | |
| tree | 1910d14e460d52445d8ae7a6a1906f4a9eec23cb /app/models/ability.rb | |
| parent | 00a1f5bc2cc2c98bda3818e770eaae95e664480a (diff) | |
| download | gitlab-ce-d431e4339269041784986da40a0e0879baaf96a9.tar.gz | |
Fix few bugs and tests after refactoring ownership logic
Diffstat (limited to 'app/models/ability.rb')
| -rw-r--r-- | app/models/ability.rb | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 90929c5b512..75a7163c219 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -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 |