diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-17 16:19:16 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-17 16:19:16 +0100 |
| commit | 16438ad205bbd953ae7fd5c290e05b60618ce7f4 (patch) | |
| tree | 54ff61e7b7817a29090539da874bd99c6312b0de /app/models/ability.rb | |
| parent | 8434e78b2802d7fe8780a2b3a7358ecfb66b95cf (diff) | |
| parent | df0110ba81a86b3e066c8b703e1c26d6d05a75da (diff) | |
| download | gitlab-ce-16438ad205bbd953ae7fd5c290e05b60618ce7f4.tar.gz | |
Merge branch 'master' into dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow
Diffstat (limited to 'app/models/ability.rb')
| -rw-r--r-- | app/models/ability.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 06c199bd8d7..95dd53bf425 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -169,6 +169,7 @@ class Ability :create_merge_request, :create_wiki, :manage_builds, + :download_build_artifacts, :push_code ] end @@ -247,6 +248,7 @@ class Ability if group.has_master?(user) || group.has_owner?(user) || user.admin? rules.push(*[ :create_projects, + :admin_milestones ]) end |