Merge pull request netlify#12 from netlify/allow-merges

biilmann · web-flow · commit fcbbc42822bd · 2018-06-04T16:08:10.000-07:00
Allow GitHub to access the merges endpoint
diff --git a/api/github.go b/api/github.go
@@ -14,7 +14,7 @@ type GitHubGateway struct {
 }
 
 var pathRegexp = regexp.MustCompile("^/github/?")
-var allowedRegexp = regexp.MustCompile("^/github/(git|contents|pulls|branches)/?")
+var allowedRegexp = regexp.MustCompile("^/github/(git|contents|pulls|branches|merges)/?")
 
 func NewGitHubGateway() *GitHubGateway {
 	return &GitHubGateway{

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ type GitHubGateway struct {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`var pathRegexp = regexp.MustCompile("^/github/?")`
`17`		`-var allowedRegexp = regexp.MustCompile("^/github/(git\|contents\|pulls\|branches)/?")`
	`17`	`+var allowedRegexp = regexp.MustCompile("^/github/(git\|contents\|pulls\|branches\|merges)/?")`
`18`	`18`
`19`	`19`	`func NewGitHubGateway() *GitHubGateway {`
`20`	`20`	`return &GitHubGateway{`