Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2026-05-06 07:37:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

repo/pull: detect case when no merge base found (#4434)

Browse Source
This commit is contained in:
Unknwon
2017-06-05 00:10:53 -04:00
parent 02a576a6a0
commit 36d6450977
11 changed files with 94 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/context/context.go
View File

@@ -153,7 +153,7 @@ func (c *Context) Handle(status int, title string, err error) {
c.Data["Title"] = "Page Not Found"
case http.StatusInternalServerError:
c.Data["Title"] = "Internal Server Error"
log.Error(2, "%s: %v", title, err)
log.Error(3, "%s: %v", title, err)
if !setting.ProdMode || (c.IsLogged && c.User.IsAdmin) {
c.Data["ErrorMsg"] = err
}