diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-08 10:32:42 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-08 10:32:42 +0100 |
| commit | 8045a81bcf5822f1992442750e1484a93c368229 (patch) | |
| tree | 94ce2b257f3ba002ac1a0fde70b69b622304810d /lib/api/notes.rb | |
| parent | 5d8a99f10429168e6471fdd1843f5045a10a84b3 (diff) | |
| parent | 2f0a75ab77af430f682d67aa9bb865007d832795 (diff) | |
| download | gitlab-ce-8045a81bcf5822f1992442750e1484a93c368229.tar.gz | |
Merge branch 'master' into fixes/api
Diffstat (limited to 'lib/api/notes.rb')
| -rw-r--r-- | lib/api/notes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/notes.rb b/lib/api/notes.rb index 75ea238fe23..47dead9dfae 100644 --- a/lib/api/notes.rb +++ b/lib/api/notes.rb @@ -3,7 +3,7 @@ module Gitlab class Notes < Grape::API before { authenticate! } - NOTEABLE_TYPES = [Issue, Snippet] + NOTEABLE_TYPES = [Issue, MergeRequest, Snippet] resource :projects do # Get a list of project wall notes |