diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-07-23 14:48:55 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-07-24 14:57:38 -0400 |
| commit | 31dc5e7034b8cace96477f23d06182c22d09b570 (patch) | |
| tree | c1fd291afebe622e723782bcbfacf7965add953f /app | |
| parent | 70de5114fbedf7c6a4557b10649003f5ccba6804 (diff) | |
| download | gitlab-ce-31dc5e7034b8cace96477f23d06182c22d09b570.tar.gz | |
Add admin_merge_request ability to Developer level and up
This was necessary because this permission is checked dynamically by
`app/views/shared/issuable/_context` when on a Merge Request.
Closes #2058
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ability.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 9258d981ac9..6a8f683bc89 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -140,12 +140,13 @@ class Ability :create_project_snippet, :update_issue, :admin_issue, - :admin_label, + :admin_label ] end def project_dev_rules project_report_rules + [ + :admin_merge_request, :create_merge_request, :create_wiki, :push_code |