diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-04 22:26:09 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-04 22:26:09 +0000 |
| commit | e7c4c22cc1c9a586fb68b5112a6ad520c80761c6 (patch) | |
| tree | b86e1c07f9c407a2f7557abd1ebc95a3e7057793 | |
| parent | 925da3fdf83b81014502f5a72191e940dd401f3c (diff) | |
| parent | e6204eb3cb4381fe3e6fcb488d72d96ebcebb7c2 (diff) | |
| download | gitlab-ce-e7c4c22cc1c9a586fb68b5112a6ad520c80761c6.tar.gz | |
Merge branch 'rs-update_merge_request' into 'master'
Move `update_merge_request` ability to Developer
Closes #13663
See merge request !3099
| -rw-r--r-- | app/models/ability.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index a866eadeebb..f34554d557c 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -188,6 +188,7 @@ class Ability def project_dev_rules @project_dev_rules ||= project_report_rules + [ :admin_merge_request, + :update_merge_request, :create_commit_status, :update_commit_status, :create_build, @@ -212,7 +213,6 @@ class Ability @project_master_rules ||= project_dev_rules + [ :push_code_to_protected_branches, :update_project_snippet, - :update_merge_request, :admin_milestone, :admin_project_snippet, :admin_project_member, |