Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
G
go-gitlab
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
go-gitlab
Commits
06b3d588
Commit
06b3d588
authored
Jun 11, 2019
by
Ben Bytheway
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for merge_requests_author_approval in ApprovalConfigurations
parent
f05516d0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
projects.go
projects.go
+2
-0
projects_test.go
projects_test.go
+6
-2
No files found.
projects.go
View file @
06b3d588
...
...
@@ -1243,6 +1243,7 @@ type ProjectApprovals struct {
ApprovalsBeforeMerge
int
`json:"approvals_before_merge"`
ResetApprovalsOnPush
bool
`json:"reset_approvals_on_push"`
DisableOverridingApproversPerMergeRequest
bool
`json:"disable_overriding_approvers_per_merge_request"`
MergeRequestsAuthorApproval
bool
`json:"merge_requests_author_approval"`
}
// GetApprovalConfiguration get the approval configuration for a project.
...
...
@@ -1279,6 +1280,7 @@ type ChangeApprovalConfigurationOptions struct {
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"`
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.
...
...
projects_test.go
View file @
06b3d588
...
...
@@ -399,7 +399,8 @@ func TestGetApprovalConfiguration(t *testing.T) {
"approver_groups": [],
"approvals_before_merge": 3,
"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) {
ApprovalsBeforeMerge
:
3
,
ResetApprovalsOnPush
:
false
,
DisableOverridingApproversPerMergeRequest
:
false
,
MergeRequestsAuthorApproval
:
true
,
}
if
!
reflect
.
DeepEqual
(
want
,
approvals
)
{
...
...
@@ -433,7 +435,8 @@ func TestChangeApprovalConfiguration(t *testing.T) {
"approver_groups": [],
"approvals_before_merge": 3,
"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) {
ApprovalsBeforeMerge
:
3
,
ResetApprovalsOnPush
:
false
,
DisableOverridingApproversPerMergeRequest
:
false
,
MergeRequestsAuthorApproval
:
true
,
}
if
!
reflect
.
DeepEqual
(
want
,
approvals
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment