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 /lib/api/notes.rb | |
| 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
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions