diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-04-10 14:39:10 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-04-14 12:05:49 +0200 |
commit | ff3caad4caf46049c8f202849a05fb15a2aaccb8 (patch) | |
tree | 77a75ff9d82a16b4f4637452c8c5fe157e0edcbc /app/models/ability.rb | |
parent | ae6d0aaae0d8f6251b30a8e5243a98f083f0cac9 (diff) | |
download | gitlab-ce-ff3caad4caf46049c8f202849a05fb15a2aaccb8.tar.gz |
Rename manage_group ability to admin_group for consistency with project.
Diffstat (limited to 'app/models/ability.rb')
-rw-r--r-- | app/models/ability.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index d2b39f667f2..85a15596f8d 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -198,11 +198,11 @@ class Ability ]) end - # Only group owner and administrators can manage group + # Only group owner and administrators can admin group if group.has_owner?(user) || user.admin? rules.push(*[ - :manage_group, - :manage_namespace + :admin_group, + :admin_namespace ]) end @@ -212,11 +212,11 @@ class Ability def namespace_abilities(user, namespace) rules = [] - # Only namespace owner and administrators can manage it + # Only namespace owner and administrators can admin it if namespace.owner == user || user.admin? rules.push(*[ :create_projects, - :manage_namespace + :admin_namespace ]) end @@ -254,7 +254,7 @@ class Ability rules = [] target_user = subject.user group = subject.group - can_manage = group_abilities(user, group).include?(:manage_group) + can_manage = group_abilities(user, group).include?(:admin_group) if can_manage && (user != target_user) rules << :modify_group_member rules << :destroy_group_member |