diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-15 15:11:45 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-05-16 14:12:19 +0200 |
| commit | 1fd83f972cf5ce73b3e46fd2df5ffb07889b1fd1 (patch) | |
| tree | 5ac1407d05f4ab5b70baa8db65944b44dc8198fd /lib/api/v3/entities.rb | |
| parent | bcc5135ba5c48130fc8afce035726057d0445e5b (diff) | |
| download | gitlab-ce-1fd83f972cf5ce73b3e46fd2df5ffb07889b1fd1.tar.gz | |
Merge branch 'bvl-rename-build-events-to-job-events' into 'master'
cherry-pick-0663458c
Rename `build_events` to `job_events`
Closes #31620
See merge request !11287
Diffstat (limited to 'lib/api/v3/entities.rb')
| -rw-r--r-- | lib/api/v3/entities.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/api/v3/entities.rb b/lib/api/v3/entities.rb index 56a9b019f1b..332f233bf5e 100644 --- a/lib/api/v3/entities.rb +++ b/lib/api/v3/entities.rb @@ -238,7 +238,8 @@ 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, :build_events, :pipeline_events + expose :tag_push_events, :note_events, :pipeline_events + expose :job_events, as: :build_events # Expose serialized properties expose :properties do |service, options| field_names = service.fields. @@ -250,7 +251,8 @@ module API class ProjectHook < ::API::Entities::Hook expose :project_id, :issues_events, :merge_requests_events - expose :note_events, :build_events, :pipeline_events, :wiki_page_events + expose :note_events, :pipeline_events, :wiki_page_events + expose :job_events, as: :build_events end class Issue < ::API::Entities::Issue |