Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-07-28 17:32:15 +0300
committerDouwe Maan <douwe@gitlab.com>2015-07-28 17:32:15 +0300
commitf9bcb9632c1f7f5c5c72d50a90289baa2af762f5 (patch)
tree8f72848f4a2560f52ea99d361d1128e7a7ff2e04 /app/models
parent43d118803133558209973464b1c16fd4c7ba446c (diff)
Add specific ability for managing group members
Diffstat (limited to 'app/models')
-rw-r--r--app/models/ability.rb5
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