Verified Commit 78c49b35 authored by Giannis Kepas's avatar Giannis Kepas Committed by GitLab
Browse files

fix: add merge_when_pipeline_succeeds webhook field 

Changelog: Improvements
parent fbf2cf55

event_webhook_types.go

+4 −0
Original line number Diff line number Diff line
@@ -765,7 +765,11 @@ type MergeEventObjectAttributes struct { 
	UpdatedByID     int64        `json:"updated_by_id"`

	MergeError      string       `json:"merge_error"`

	MergeParams     *MergeParams `json:"merge_params"`

	// Deprecated: GitLab never emits the "merge_when_build_succeeds" key in

	// merge request webhooks, so this field is always false. Use

	// MergeWhenPipelineSucceeds instead.

	MergeWhenBuildSucceeds      bool                        `json:"merge_when_build_succeeds"`

	MergeWhenPipelineSucceeds   bool                        `json:"merge_when_pipeline_succeeds"`

	MergeUserID                 int64                       `json:"merge_user_id"`

	MergeCommitSHA              string                      `json:"merge_commit_sha"`

	DeletedAt                   string                      `json:"deleted_at"`

event_webhook_types_test.go

+2 −0
Original line number Diff line number Diff line
@@ -859,6 +859,7 @@ func TestMergeEventUnmarshal(t *testing.T) { 
			BlockingDiscussionsResolved: true,

			FirstContribution:           true,

			MergeStatus:                 "unchecked",

			MergeWhenPipelineSucceeds:   true,

			TargetProjectID:             14,

			IID:                         1,

			URL:                         "http://example.com/diaspora/merge_requests/1",
@@ -1005,6 +1006,7 @@ func TestMergeEventUnmarshalFromGroup(t *testing.T) { 
		ObjectAttributes: MergeEventObjectAttributes{

			ID:                        15917,

			MergeParams:               &MergeParams{},

			MergeWhenPipelineSucceeds: true,

			MergeCommitSHA:            "ac3ca1559bc39abf963586372eff7f8fdded646e",

			Source:                    exmProjectRepo,

			Target:                    exmProjectRepo,

testdata/webhooks/group_merge_request.json

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
    "merge_params": {

      "force_remove_source_branch": "0"

    },

    "merge_when_build_succeeds": false,

    "merge_when_pipeline_succeeds": true,

    "merge_user_id": null,

    "merge_commit_sha": "ac3ca1559bc39abf963586372eff7f8fdded646e",

    "deleted_at": null,

testdata/webhooks/merge_request.json

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
    "work_in_progress": false,

    "first_contribution": true,

    "merge_status": "unchecked",

    "merge_when_pipeline_succeeds": true,

    "target_project_id": 14,

    "description": "",

    "url": "http://example.com/diaspora/merge_requests/1",