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

Merge branch 'rs-issue-2058' into 'master'
330109ee · Valery Sizov · 70de5114 · b5e6ffa6 · 330109ee · 330109ee
Commit 330109ee authored Jul 24, 2015 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

ability.rb app/models/ability.rb +2 -1

permissions.md doc/permissions/permissions.md +1 -0

No files found.
--- 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

--- 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        |         |            | ✓           | ✓        | ✓      |