summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/api/projects.md2
-rw-r--r--lib/api/project_hooks.rb6
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md
index fc22f58acef..96485857035 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -538,6 +538,7 @@ Parameters:
- `merge_requests_events` - Trigger hook on merge_requests events
- `tag_push_events` - Trigger hook on push_tag events
- `note_events` - Trigger hook on note events
+- `enable_ssl_verification` - Do SSL verification when triggering the hook
### Edit project hook
@@ -557,6 +558,7 @@ Parameters:
- `merge_requests_events` - Trigger hook on merge_requests events
- `tag_push_events` - Trigger hook on push_tag events
- `note_events` - Trigger hook on note events
+- `enable_ssl_verification` - Do SSL verification when triggering the hook
### Delete project hook
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