issues api allow pulls and fix #4832 (#4852) (#4862)

This commit is contained in:
Lunny Xiao 2018-09-05 10:13:56 +08:00 committed by techknowlogick
parent 745c898561
commit 1901f35980
1 changed files with 9 additions and 1 deletions

View File

@ -273,6 +273,14 @@ func mustAllowPulls(ctx *context.Context) {
} }
} }
func mustEnableIssuesOrPulls(ctx *context.Context) {
if !ctx.Repo.Repository.UnitEnabled(models.UnitTypeIssues) &&
!ctx.Repo.Repository.AllowsPulls() {
ctx.Status(404)
return
}
}
// RegisterRoutes registers all v1 APIs routes to web application. // RegisterRoutes registers all v1 APIs routes to web application.
// FIXME: custom form error response // FIXME: custom form error response
func RegisterRoutes(m *macaron.Macaron) { func RegisterRoutes(m *macaron.Macaron) {
@ -447,7 +455,7 @@ func RegisterRoutes(m *macaron.Macaron) {
Post(reqToken(), bind(api.AddTimeOption{}), repo.AddTime) Post(reqToken(), bind(api.AddTimeOption{}), repo.AddTime)
}) })
}) })
}, mustEnableIssues) }, mustEnableIssuesOrPulls)
m.Group("/labels", func() { m.Group("/labels", func() {
m.Combo("").Get(repo.ListLabels). m.Combo("").Get(repo.ListLabels).
Post(reqToken(), bind(api.CreateLabelOption{}), repo.CreateLabel) Post(reqToken(), bind(api.CreateLabelOption{}), repo.CreateLabel)