From 1fd83f972cf5ce73b3e46fd2df5ffb07889b1fd1 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Mon, 15 May 2017 15:11:45 +0000
Subject: Merge branch 'bvl-rename-build-events-to-job-events' into 'master'

Rename `build_events` to `job_events`

Closes #31620

See merge request !11287
---
 lib/api/entities.rb      | 4 ++--
 lib/api/project_hooks.rb | 2 --
 lib/api/v3/entities.rb   | 6 ++++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 3fc2b453eb6..01cc8e8e1ca 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 :build_events, as: :job_events
+      expose :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 :build_events, as: :job_events
+      expose :job_events
       # Expose serialized properties
       expose :properties do |service, options|
         field_names = service.fields.
diff --git a/lib/api/project_hooks.rb b/lib/api/project_hooks.rb
index 87dfd1573a4..7a345289617 100644
--- a/lib/api/project_hooks.rb
+++ b/lib/api/project_hooks.rb
@@ -54,7 +54,6 @@ module API
       end
       post ":id/hooks" do
         hook_params = declared_params(include_missing: false)
-        hook_params[:build_events] = hook_params.delete(:job_events) { false }
 
         hook = user_project.hooks.new(hook_params)
 
@@ -78,7 +77,6 @@ module API
         hook = user_project.hooks.find(params.delete(:hook_id))
 
         update_params = declared_params(include_missing: false)
-        update_params[:build_events] = update_params.delete(:job_events) if update_params[:job_events]
 
         if hook.update_attributes(update_params)
           present hook, with: Entities::ProjectHook
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
-- 
cgit v1.2.1