summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2015-12-14 10:32:57 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2015-12-14 10:32:57 +0000
commite81ae1e68c03de4442265e4699710421e2f2755c (patch)
treec3af812b5a8e8dbb3637370550550de777e53b36 /lib/api/entities.rb
parentc80f34257dc389369801eb112506706d46051bb1 (diff)
parenta0c2a7b0cbb4567a1f09c4cbc400bf75df47a072 (diff)
downloadgitlab-ce-e81ae1e68c03de4442265e4699710421e2f2755c.tar.gz
Merge branch 'ci-services-migrate' into 'master'
Ci Services migrate See merge request !1985
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 81bf7a8222b..03e3056a87e 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -45,7 +45,8 @@ module API
class ProjectHook < Hook
expose :project_id, :push_events
- expose :issues_events, :merge_requests_events, :tag_push_events, :note_events, :enable_ssl_verification
+ expose :issues_events, :merge_requests_events, :tag_push_events, :note_events, :build_events
+ expose :enable_ssl_verification
end
class ForkedFromProject < Grape::Entity
@@ -252,7 +253,7 @@ module API
class ProjectService < Grape::Entity
expose :id, :title, :created_at, :updated_at, :active
- expose :push_events, :issues_events, :merge_requests_events, :tag_push_events, :note_events
+ expose :push_events, :issues_events, :merge_requests_events, :tag_push_events, :note_events, :build_events
# Expose serialized properties
expose :properties do |service, options|
field_names = service.fields.