diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-09-24 23:28:59 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-09-24 23:28:59 +0000 |
| commit | d5e73ae63417b6593926dff81a2a63c4255d4c92 (patch) | |
| tree | 0aa79a70ad1714ac373573eef4bf11e51b58b686 /lib | |
| parent | 817a60894a8cb37539c9225b6619083100bc75fc (diff) | |
| parent | 869bab9d68b2df9089fb8bfd42ca1bfee6e4baf3 (diff) | |
| download | gitlab-ce-d5e73ae63417b6593926dff81a2a63c4255d4c92.tar.gz | |
Merge branch 'hook-api-updates' into 'master'
Hook api updates
See merge request !1429
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 2 | ||||
| -rw-r--r-- | lib/api/project_hooks.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 33b6224a810..9620d36ac41 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -45,7 +45,7 @@ module API class ProjectHook < Hook expose :project_id, :push_events - expose :issues_events, :merge_requests_events, :tag_push_events + expose :issues_events, :merge_requests_events, :tag_push_events, :note_events, :enable_ssl_verification end class ForkedFromProject < Grape::Entity diff --git a/lib/api/project_hooks.rb b/lib/api/project_hooks.rb index ad4d2e65dfd..882d1a083ad 100644 --- a/lib/api/project_hooks.rb +++ b/lib/api/project_hooks.rb @@ -44,7 +44,8 @@ module API :issues_events, :merge_requests_events, :tag_push_events, - :note_events + :note_events, + :enable_ssl_verification ] @hook = user_project.hooks.new(attrs) @@ -75,7 +76,8 @@ module API :issues_events, :merge_requests_events, :tag_push_events, - :note_events + :note_events, + :enable_ssl_verification ] if @hook.update_attributes attrs |