summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2015-09-24 12:33:11 -0400
committerBen Boeckel <ben.boeckel@kitware.com>2015-09-24 12:33:11 -0400
commit22db4398c69e75da8c56775a7c815b6e2cb38496 (patch)
tree17f170d161962255a5d43806b1079b7f7340f30b
parentc4ca1ad4c33bc90074a9321e9cd5a2404a62cc92 (diff)
downloadgitlab-ce-22db4398c69e75da8c56775a7c815b6e2cb38496.tar.gz
api: expose note_events and enable_ssl_verification for hooks
-rw-r--r--doc/api/projects.md2
-rw-r--r--lib/api/entities.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 10533c73a31..9f9a274a7e8 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -515,6 +515,8 @@ Parameters:
"push_events": "true",
"issues_events": "true",
"merge_requests_events": "true",
+ "note_events": "true",
+ "enable_ssl_verification": "true",
"created_at": "2012-10-12T17:04:47Z"
}
```
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