Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run dep ensure -update #5988

Closed
wants to merge 3 commits into from
Closed

Run dep ensure -update #5988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb55455
Run `dep ensure -update`
Dec 15, 2017
ff51904
Follow github changes after updating
Dec 16, 2017
b5c7ba2
Make mungegithub follow github changes
Dec 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
133 changes: 83 additions & 50 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ghclient/wrappers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ type pullRequestService interface {
type repositoryService interface {
CreateStatus(ctx context.Context, org, repo, ref string, status *github.RepoStatus) (*github.RepoStatus, *github.Response, error)
GetCombinedStatus(ctx context.Context, org, repo, ref string, opt *github.ListOptions) (*github.CombinedStatus, *github.Response, error)
ListCollaborators(ctx context.Context, owner, repo string, opt *github.ListOptions) ([]*github.User, *github.Response, error)
ListCollaborators(ctx context.Context, owner, repo string, opt *github.ListCollaboratorsOptions) ([]*github.User, *github.Response, error)
}

type usersService interface {
Expand Down Expand Up @@ -144,11 +144,12 @@ func (c *Client) ForEachPR(owner, repo string, opts *github.PullRequestListOptio
// GetCollaborators returns all github users who are members or outside collaborators of the repo.
func (c *Client) GetCollaborators(org, repo string) ([]*github.User, error) {
opts := &github.ListOptions{}
copts := &github.ListCollaboratorsOptions{}
collaborators, err := c.depaginate(
fmt.Sprintf("getting collaborators for '%s/%s'", org, repo),
opts,
func() ([]interface{}, *github.Response, error) {
page, resp, err := c.repoService.ListCollaborators(context.Background(), org, repo, opts)
page, resp, err := c.repoService.ListCollaborators(context.Background(), org, repo, copts)

var interfaceList []interface{}
if err == nil {
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/github/github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ func (config *Config) SetBranchProtection(name string, contexts []string) error
Strict: false,
Contexts: contexts,
},
RequiredPullRequestReviews: prot.RequiredPullRequestReviews,
RequiredPullRequestReviews: *github.PullRequestReviewsEnforcementRequest,
Restrictions: unchangedRestrictionRequest(prot.Restrictions),
EnforceAdmins: false,
}
Expand Down
Loading