diff --git a/Gopkg.lock b/Gopkg.lock index e5de154d0..7f1dcc039 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -99,7 +99,7 @@ branch = "master" name = "github.com/lkysow/go-gitlab" packages = ["."] - revision = "5aba7769280ffa5408f98e1b95290989cc1428c5" + revision = "fcd13266e57eb071cbedfe8efc7969a7bc4c8f22" [[projects]] name = "github.com/magiconair/properties" diff --git a/server/events/vcs/gitlab_client.go b/server/events/vcs/gitlab_client.go index 58123f82c..95568927e 100644 --- a/server/events/vcs/gitlab_client.go +++ b/server/events/vcs/gitlab_client.go @@ -72,7 +72,7 @@ func (g *GitlabClient) PullIsApproved(repo models.Repo, pull models.PullRequest) if err != nil { return false, err } - if approvals.ApprovalsMissing > 0 { + if approvals.ApprovalsLeft > 0 { return false, nil } return true, nil diff --git a/vendor/github.com/lkysow/go-gitlab/merge_requests.go b/vendor/github.com/lkysow/go-gitlab/merge_requests.go index 214d8e1a9..3c67b93ef 100644 --- a/vendor/github.com/lkysow/go-gitlab/merge_requests.go +++ b/vendor/github.com/lkysow/go-gitlab/merge_requests.go @@ -114,7 +114,7 @@ type MergeRequestApprovals struct { UpdatedAt *time.Time `json:"updated_at"` MergeStatus string `json:"merge_status"` ApprovalsRequired int `json:"approvals_required"` - ApprovalsMissing int `json:"approvals_missing"` + ApprovalsLeft int `json:"approvals_left"` ApprovedBy []struct { User struct { Name string `json:"name"`