diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-15 20:24:19 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-15 20:24:19 +0000 |
| commit | 950fa32a7c2c25d70bf8b2d495d759ce40bf2d9b (patch) | |
| tree | 0215a0fe17940cce0118ab434a5636a0b9c63f9b /lib/api/v3/entities.rb | |
| parent | ffabab80a7b0cebe322aaf9bb2ca8e617a0b790f (diff) | |
| download | gitlab-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/v3/entities.rb')
| -rw-r--r-- | lib/api/v3/entities.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/api/v3/entities.rb b/lib/api/v3/entities.rb index 332f233bf5e..56a9b019f1b 100644 --- a/lib/api/v3/entities.rb +++ b/lib/api/v3/entities.rb @@ -238,8 +238,7 @@ module API class ProjectService < Grape::Entity 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, as: :build_events + expose :tag_push_events, :note_events, :build_events, :pipeline_events # Expose serialized properties expose :properties do |service, options| field_names = service.fields. @@ -251,8 +250,7 @@ module API class ProjectHook < ::API::Entities::Hook expose :project_id, :issues_events, :merge_requests_events - expose :note_events, :pipeline_events, :wiki_page_events - expose :job_events, as: :build_events + expose :note_events, :build_events, :pipeline_events, :wiki_page_events end class Issue < ::API::Entities::Issue |