summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-05-15 20:24:19 +0000
committerDouwe Maan <douwe@gitlab.com>2017-05-15 20:24:19 +0000
commit950fa32a7c2c25d70bf8b2d495d759ce40bf2d9b (patch)
tree0215a0fe17940cce0118ab434a5636a0b9c63f9b /lib/api/entities.rb
parentffabab80a7b0cebe322aaf9bb2ca8e617a0b790f (diff)
downloadgitlab-ce-950fa32a7c2c25d70bf8b2d495d759ce40bf2d9b.tar.gz
Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"
This reverts merge request !11287
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 01cc8e8e1ca..3fc2b453eb6 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -60,7 +60,7 @@ module API
class ProjectHook < Hook
expose :project_id, :issues_events, :merge_requests_events
expose :note_events, :pipeline_events, :wiki_page_events
- expose :job_events
+ expose :build_events, as: :job_events
end
class BasicProjectDetails < Grape::Entity
@@ -470,7 +470,7 @@ module API
expose :id, :title, :created_at, :updated_at, :active
expose :push_events, :issues_events, :merge_requests_events
expose :tag_push_events, :note_events, :pipeline_events
- expose :job_events
+ expose :build_events, as: :job_events
# Expose serialized properties
expose :properties do |service, options|
field_names = service.fields.