From 9c0e2d5b47c09eba83c3f73d4b01e2b27378cb4d Mon Sep 17 00:00:00 2001 From: Bian Jiaping Date: Wed, 11 Sep 2019 19:33:45 +0000 Subject: Add source and merge_request fields to pipeline event webhook --- lib/gitlab/data_builder/pipeline.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'lib') diff --git a/lib/gitlab/data_builder/pipeline.rb b/lib/gitlab/data_builder/pipeline.rb index e1e813849bf..da3d6c47431 100644 --- a/lib/gitlab/data_builder/pipeline.rb +++ b/lib/gitlab/data_builder/pipeline.rb @@ -9,6 +9,7 @@ module Gitlab { object_kind: 'pipeline', object_attributes: hook_attrs(pipeline), + merge_request: pipeline.merge_request && merge_request_attrs(pipeline.merge_request), user: pipeline.user.try(:hook_attrs), project: pipeline.project.hook_attrs(backward: false), commit: pipeline.commit.try(:hook_attrs), @@ -23,6 +24,7 @@ module Gitlab tag: pipeline.tag, sha: pipeline.sha, before_sha: pipeline.before_sha, + source: pipeline.source, status: pipeline.status, detailed_status: pipeline.detailed_status(nil).label, stages: pipeline.stages_names, @@ -33,6 +35,21 @@ module Gitlab } end + def merge_request_attrs(merge_request) + { + id: merge_request.id, + iid: merge_request.iid, + title: merge_request.title, + source_branch: merge_request.source_branch, + source_project_id: merge_request.source_project_id, + target_branch: merge_request.target_branch, + target_project_id: merge_request.target_project_id, + state: merge_request.state, + merge_status: merge_request.merge_status, + url: Gitlab::UrlBuilder.build(merge_request) + } + end + def build_hook_attrs(build) { id: build.id, -- cgit v1.2.3