diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-07-31 16:25:53 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-07-31 16:25:53 +0300 |
| commit | 3307008499c81c8dc88da633e9c6f063d770a676 (patch) | |
| tree | 9386aaade4d4a2770e446826dffec022efad8688 /app/models | |
| parent | 7a048cf4bf4bbf64757a02e57fa87bbad5289d02 (diff) | |
| parent | 0736f348a6953e6417d3857b78ea5c7eb5954e51 (diff) | |
Merge branch 'admin-group-member' into 'master'
Add specific ability for managing group members
To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue)
See merge request !1059
Diffstat (limited to 'app/models')
| -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 |