diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-07-24 20:14:13 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-07-24 20:14:13 +0000 |
| commit | 330109ee4142f5eca53ff536828626694f4e7db8 (patch) | |
| tree | aae54dc9efb6f011db8d5ae9a89bd1e547046a03 | |
| parent | 70de5114fbedf7c6a4557b10649003f5ccba6804 (diff) | |
| parent | b5e6ffa6165e9bbb999dd6b69e6161da80f66e7f (diff) | |
| download | gitlab-ce-330109ee4142f5eca53ff536828626694f4e7db8.tar.gz | |
Merge branch 'rs-issue-2058' into 'master'
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
See merge request !1037
| -rw-r--r-- | app/models/ability.rb | 3 | ||||
| -rw-r--r-- | doc/permissions/permissions.md | 1 |
2 files changed, 3 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 diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md index 70b7e17795d..e81432c600f 100644 --- a/doc/permissions/permissions.md +++ b/doc/permissions/permissions.md @@ -17,6 +17,7 @@ If a user is a GitLab administrator they receive all permissions. | Create code snippets | | ✓ | ✓ | ✓ | ✓ | | Manage issue tracker | | ✓ | ✓ | ✓ | ✓ | | Manage labels | | ✓ | ✓ | ✓ | ✓ | +| Manage merge requests | | | ✓ | ✓ | ✓ | | Create new merge request | | | ✓ | ✓ | ✓ | | Create new branches | | | ✓ | ✓ | ✓ | | Push to non-protected branches | | | ✓ | ✓ | ✓ | |