diff options
| author | Sergio Benitez <sbenitez@mit.edu> | 2015-09-09 13:44:51 -0700 |
|---|---|---|
| committer | Sergio Benitez <sbenitez@mit.edu> | 2015-09-09 13:44:51 -0700 |
| commit | 964d0262ff353db6a50ed5be83ebd22f71aa6e69 (patch) | |
| tree | 8cbab6b6a9b4f62cbe9acb2a0b8752b531633362 /routers/repo/pull.go | |
| parent | 079a2d68db5c843ef2dbba65aeca46d5887d6b02 (diff) | |
| parent | b75d0378cbbf0523963fd9bc749543244be7392b (diff) | |
Merged conflicts.
Diffstat (limited to 'routers/repo/pull.go')
| -rw-r--r-- | routers/repo/pull.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 19f9f5b8..c1eec7cc 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -38,9 +38,8 @@ func getForkRepository(ctx *middleware.Context) *models.Repository { return nil } - // Cannot fork bare repo. - if forkRepo.IsBare { - ctx.Handle(404, "", nil) + if !forkRepo.CanBeForked() { + ctx.Handle(404, "getForkRepository", nil) return nil } |