summaryrefslogtreecommitdiff
path: root/lib/api/project_hooks.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-26 16:41:15 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-26 16:41:15 +0300
commitebe0aef26901aee211e78b861925bbab97027aa6 (patch)
tree77107e15f02ac34577ba01968321726f366d1d5a /lib/api/project_hooks.rb
parent109a3684f0775cbb3dbb709b0494ca6ebae0ae3c (diff)
parent608ad7dde39f10603750f08179230d0f6ea7a8a0 (diff)
downloadgitlab-ce-ebe0aef26901aee211e78b861925bbab97027aa6.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib/api/project_hooks.rb')
-rw-r--r--lib/api/project_hooks.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/api/project_hooks.rb b/lib/api/project_hooks.rb
index be9850367b9..ad4d2e65dfd 100644
--- a/lib/api/project_hooks.rb
+++ b/lib/api/project_hooks.rb
@@ -43,7 +43,8 @@ module API
:push_events,
:issues_events,
:merge_requests_events,
- :tag_push_events
+ :tag_push_events,
+ :note_events
]
@hook = user_project.hooks.new(attrs)
@@ -73,7 +74,8 @@ module API
:push_events,
:issues_events,
:merge_requests_events,
- :tag_push_events
+ :tag_push_events,
+ :note_events
]
if @hook.update_attributes attrs