Skip to content

Commit

Permalink
Fixing apply permission when MR status is draft (#1736)
Browse files Browse the repository at this point in the history
  • Loading branch information
devlucasc authored Aug 4, 2021
1 parent ebf3db4 commit 552e4a2
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions server/events/vcs/gitlab_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ func (g *GitlabClient) PullIsMergeable(repo models.Repo, pull models.PullRequest
if mr.MergeStatus == "can_be_merged" &&
mr.ApprovalsBeforeMerge <= 0 &&
mr.BlockingDiscussionsResolved &&
!mr.WorkInProgress &&
(allowSkippedPipeline || !isPipelineSkipped) {
return true, nil
}
Expand Down

0 comments on commit 552e4a2

Please sign in to comment.