diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-17 14:33:35 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-17 14:33:35 +0100 |
| commit | 7b014338ca94caf4677a035f28469945e6a80100 (patch) | |
| tree | c442bdae95edb35d14551ca04052227bdb840511 /app/models/ability.rb | |
| parent | bb8b6f38e7fef0afd41088d54d9dda41695ec1c7 (diff) | |
| parent | 1c040b3f0a3ecb18fc8fdea3cf99b70edad8d873 (diff) | |
| download | gitlab-ce-contributor-graph-by-email.tar.gz | |
Merge branch 'master' into contributor-graph-by-emailcontributor-graph-by-email
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 b72178fa126..d01b3ae6f05 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -154,6 +154,7 @@ class Ability :create_merge_request, :create_wiki, :manage_builds, + :download_build_artifacts, :push_code ] end @@ -232,6 +233,7 @@ class Ability if group.has_master?(user) || group.has_owner?(user) || user.admin? rules.push(*[ :create_projects, + :admin_milestones ]) end |