diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-17 15:40:54 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-17 15:40:54 +0100 |
| commit | e849b51cae8956c9d4eebe9c42804443a55edb83 (patch) | |
| tree | 69d96404ed3d9fb6f10d59334cffce4c4cf62725 /app/models/ability.rb | |
| parent | 56ea71a3b19396b01b3b8495337fbf22c534524f (diff) | |
| parent | 1c040b3f0a3ecb18fc8fdea3cf99b70edad8d873 (diff) | |
| download | gitlab-ce-e849b51cae8956c9d4eebe9c42804443a55edb83.tar.gz | |
Merge branch 'master' into james11/gitlab-ce-removable-group-owner
Diffstat (limited to 'app/models/ability.rb')
| -rw-r--r-- | app/models/ability.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 6526cc6bc6a..eef481c8f8a 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -155,6 +155,7 @@ class Ability :create_merge_request, :create_wiki, :manage_builds, + :download_build_artifacts, :push_code ] end @@ -231,9 +232,10 @@ class Ability # Only group masters and group owners can create new projects in group if group.has_master?(user) || group.has_owner?(user) || user.admin? - rules.push(*[ - :create_projects, - ]) + rules += [ + :create_projects, + :admin_milestones + ] end # Only group owner and administrators can admin group |