Commit 06b3d588 authored by Ben Bytheway's avatar Ben Bytheway

Add support for merge_requests_author_approval in ApprovalConfigurations

parent f05516d0
...@@ -1243,6 +1243,7 @@ type ProjectApprovals struct { ...@@ -1243,6 +1243,7 @@ type ProjectApprovals struct {
ApprovalsBeforeMerge int `json:"approvals_before_merge"` ApprovalsBeforeMerge int `json:"approvals_before_merge"`
ResetApprovalsOnPush bool `json:"reset_approvals_on_push"` ResetApprovalsOnPush bool `json:"reset_approvals_on_push"`
DisableOverridingApproversPerMergeRequest bool `json:"disable_overriding_approvers_per_merge_request"` DisableOverridingApproversPerMergeRequest bool `json:"disable_overriding_approvers_per_merge_request"`
MergeRequestsAuthorApproval bool `json:"merge_requests_author_approval"`
} }
// GetApprovalConfiguration get the approval configuration for a project. // GetApprovalConfiguration get the approval configuration for a project.
...@@ -1279,6 +1280,7 @@ type ChangeApprovalConfigurationOptions struct { ...@@ -1279,6 +1280,7 @@ type ChangeApprovalConfigurationOptions struct {
ApprovalsBeforeMerge *int `url:"approvals_before_merge,omitempty" json:"approvals_before_merge,omitempty"` ApprovalsBeforeMerge *int `url:"approvals_before_merge,omitempty" json:"approvals_before_merge,omitempty"`
ResetApprovalsOnPush *bool `url:"reset_approvals_on_push,omitempty" json:"reset_approvals_on_push,omitempty"` ResetApprovalsOnPush *bool `url:"reset_approvals_on_push,omitempty" json:"reset_approvals_on_push,omitempty"`
DisableOverridingApproversPerMergeRequest *bool `url:"disable_overriding_approvers_per_merge_request,omitempty" json:"disable_overriding_approvers_per_merge_request,omitempty"` DisableOverridingApproversPerMergeRequest *bool `url:"disable_overriding_approvers_per_merge_request,omitempty" json:"disable_overriding_approvers_per_merge_request,omitempty"`
MergeRequestsAuthorApproval *bool `url:"merge_requests_author_approval,omitempty" json:"merge_requests_author_approval,omitempty"`
} }
// ChangeApprovalConfiguration updates the approval configuration for a project. // ChangeApprovalConfiguration updates the approval configuration for a project.
......
...@@ -399,7 +399,8 @@ func TestGetApprovalConfiguration(t *testing.T) { ...@@ -399,7 +399,8 @@ func TestGetApprovalConfiguration(t *testing.T) {
"approver_groups": [], "approver_groups": [],
"approvals_before_merge": 3, "approvals_before_merge": 3,
"reset_approvals_on_push": false, "reset_approvals_on_push": false,
"disable_overriding_approvers_per_merge_request": false "disable_overriding_approvers_per_merge_request": false,
"merge_requests_author_approval": true
}`) }`)
}) })
...@@ -414,6 +415,7 @@ func TestGetApprovalConfiguration(t *testing.T) { ...@@ -414,6 +415,7 @@ func TestGetApprovalConfiguration(t *testing.T) {
ApprovalsBeforeMerge: 3, ApprovalsBeforeMerge: 3,
ResetApprovalsOnPush: false, ResetApprovalsOnPush: false,
DisableOverridingApproversPerMergeRequest: false, DisableOverridingApproversPerMergeRequest: false,
MergeRequestsAuthorApproval: true,
} }
if !reflect.DeepEqual(want, approvals) { if !reflect.DeepEqual(want, approvals) {
...@@ -433,7 +435,8 @@ func TestChangeApprovalConfiguration(t *testing.T) { ...@@ -433,7 +435,8 @@ func TestChangeApprovalConfiguration(t *testing.T) {
"approver_groups": [], "approver_groups": [],
"approvals_before_merge": 3, "approvals_before_merge": 3,
"reset_approvals_on_push": false, "reset_approvals_on_push": false,
"disable_overriding_approvers_per_merge_request": false "disable_overriding_approvers_per_merge_request": false,
"merge_requests_author_approval": true
}`) }`)
}) })
...@@ -452,6 +455,7 @@ func TestChangeApprovalConfiguration(t *testing.T) { ...@@ -452,6 +455,7 @@ func TestChangeApprovalConfiguration(t *testing.T) {
ApprovalsBeforeMerge: 3, ApprovalsBeforeMerge: 3,
ResetApprovalsOnPush: false, ResetApprovalsOnPush: false,
DisableOverridingApproversPerMergeRequest: false, DisableOverridingApproversPerMergeRequest: false,
MergeRequestsAuthorApproval: true,
} }
if !reflect.DeepEqual(want, approvals) { if !reflect.DeepEqual(want, approvals) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment