diff options
author | Rémy Coutable <remy@rymai.me> | 2017-04-12 14:18:47 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2017-04-19 12:22:23 +0300 |
commit | 191772058c5f79434a0c984de823226beda94740 (patch) | |
tree | 4f029d59cf47e2a3dc01842952544aba7b80926f /lib | |
parent | a5ffb991e4cd847b5b789bfe2b9c3c1d6b70e5c7 (diff) |
Merge branch 'zj-api-fix-build-events' into 'master'
Api fix build events rename to Job events
Closes #30412
See merge request !10586
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/project_hooks.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/api/project_hooks.rb b/lib/api/project_hooks.rb index 57a5f97dc7f..47039b928cc 100644 --- a/lib/api/project_hooks.rb +++ b/lib/api/project_hooks.rb @@ -13,7 +13,7 @@ module API optional :merge_requests_events, type: Boolean, desc: "Trigger hook on merge request events" optional :tag_push_events, type: Boolean, desc: "Trigger hook on tag push events" optional :note_events, type: Boolean, desc: "Trigger hook on note(comment) events" - optional :build_events, type: Boolean, desc: "Trigger hook on build events" + optional :job_events, type: Boolean, desc: "Trigger hook on job events" optional :pipeline_events, type: Boolean, desc: "Trigger hook on pipeline events" optional :wiki_page_events, type: Boolean, desc: "Trigger hook on wiki events" optional :enable_ssl_verification, type: Boolean, desc: "Do SSL verification when triggering the hook" @@ -53,7 +53,10 @@ module API use :project_hook_properties end post ":id/hooks" do - hook = user_project.hooks.new(declared_params(include_missing: false)) + hook_params = declared_params(include_missing: false) + hook_params[:build_events] = hook_params.delete(:job_events) { false } + + hook = user_project.hooks.new(hook_params) if hook.save present hook, with: Entities::ProjectHook @@ -74,7 +77,10 @@ module API put ":id/hooks/:hook_id" do hook = user_project.hooks.find(params.delete(:hook_id)) - if hook.update_attributes(declared_params(include_missing: false)) + 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 else error!("Invalid url given", 422) if hook.errors[:url].present? |