diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-02 18:57:02 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-02 18:57:02 +0200 |
| commit | 91995909d9ef6fc5540c7577987ed2244ac7862a (patch) | |
| tree | 8d1d30d22d97e636f75412185be425bccdacc918 /app/models | |
| parent | 0bda2d5d2bfd04161ed763c75e1bded90b73d8a5 (diff) | |
| download | gitlab-ce-91995909d9ef6fc5540c7577987ed2244ac7862a.tar.gz | |
Fix #2375. Admin and owner can manage groups
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ability.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 2d80c6720b7..90929c5b512 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -107,9 +107,12 @@ class Ability def group_abilities user, group rules = [] - rules << [ - :manage_group - ] if group.owner == user + # Only group owner and administrators can manage group + if group.owner == user || user.admin? + rules << [ + :manage_group + ] + end rules.flatten end |