diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-07-28 16:32:15 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-07-28 16:32:15 +0200 |
commit | f9bcb9632c1f7f5c5c72d50a90289baa2af762f5 (patch) | |
tree | 8f72848f4a2560f52ea99d361d1128e7a7ff2e04 /app/models/ability.rb | |
parent | 43d118803133558209973464b1c16fd4c7ba446c (diff) | |
download | gitlab-ce-f9bcb9632c1f7f5c5c72d50a90289baa2af762f5.tar.gz |
Add specific ability for managing group members
Diffstat (limited to 'app/models/ability.rb')
-rw-r--r-- | app/models/ability.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 6a8f683bc89..f8e5afa9b01 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -233,7 +233,8 @@ class Ability if group.has_owner?(user) || user.admin? rules.push(*[ :admin_group, - :admin_namespace + :admin_namespace, + :admin_group_member ]) end @@ -295,7 +296,7 @@ class Ability rules = [] target_user = subject.user group = subject.group - can_manage = group_abilities(user, group).include?(:admin_group) + can_manage = group_abilities(user, group).include?(:admin_group_member) if can_manage && (user != target_user) rules << :update_group_member |