diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | cmd/web.go | 4 | ||||
| -rw-r--r-- | models/issue.go | 5 | ||||
| -rw-r--r-- | routers/debug/ignored.go | 11 | ||||
| -rw-r--r-- | routers/dev/debug.go (renamed from routers/debug/debug.go) | 8 |
5 files changed, 10 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore index 65252f8c2d..f8d8a2869c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ public/img/avatar/ *.o *.a *.so -dev # Folders _obj diff --git a/cmd/web.go b/cmd/web.go index 3ee38f76c4..5f9c168d88 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -26,7 +26,6 @@ import ( "github.com/gogits/gogs/routers" "github.com/gogits/gogs/routers/admin" "github.com/gogits/gogs/routers/api/v1" - "github.com/gogits/gogs/routers/debug" "github.com/gogits/gogs/routers/dev" "github.com/gogits/gogs/routers/org" "github.com/gogits/gogs/routers/repo" @@ -185,6 +184,7 @@ func runWeb(*cli.Context) { if martini.Env == martini.Dev { m.Get("/template/**", dev.TemplatePreview) + dev.RegisterDebugRoutes(m) } reqTrueOwner := middleware.RequireTrueOwner() @@ -206,8 +206,6 @@ func runWeb(*cli.Context) { r.Post("/:org/settings/delete", org.DeletePost) }, reqSignIn) - debug.RegisterRoutes(m) - m.Group("/:username/:reponame", func(r martini.Router) { r.Get("/settings", repo.Setting) r.Post("/settings", bindIgnErr(auth.RepoSettingForm{}), repo.SettingPost) diff --git a/models/issue.go b/models/issue.go index 6d67a72bc4..baf710a5ee 100644 --- a/models/issue.go +++ b/models/issue.go @@ -276,6 +276,10 @@ func GetIssueUserPairs(rid, uid int64, isClosed bool) ([]*IssueUser, error) { // GetIssueUserPairsByRepoIds returns issue-user pairs by given repository IDs. func GetIssueUserPairsByRepoIds(rids []int64, isClosed bool, page int) ([]*IssueUser, error) { + if len(rids) == 0 { + return []*IssueUser{}, nil + } + buf := bytes.NewBufferString("") for _, rid := range rids { buf.WriteString("repo_id=") @@ -283,7 +287,6 @@ func GetIssueUserPairsByRepoIds(rids []int64, isClosed bool, page int) ([]*Issue buf.WriteString(" OR ") } cond := strings.TrimSuffix(buf.String(), " OR ") - ius := make([]*IssueUser, 0, 10) sess := x.Limit(20, (page-1)*20).Where("is_closed=?", isClosed) if len(cond) > 0 { diff --git a/routers/debug/ignored.go b/routers/debug/ignored.go deleted file mode 100644 index 4ec49964b7..0000000000 --- a/routers/debug/ignored.go +++ /dev/null @@ -1,11 +0,0 @@ -// +build !pprof
-
-package debug
-
-import (
- "github.com/go-martini/martini"
-)
-
-func RegisterRoutes(r martini.Router) {
- // do nothing
-}
diff --git a/routers/debug/debug.go b/routers/dev/debug.go index f61e7d2eeb..62022146ad 100644 --- a/routers/debug/debug.go +++ b/routers/dev/debug.go @@ -1,6 +1,8 @@ -// +build pprof
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
-package debug
+package dev
import (
"net/http/pprof"
@@ -8,7 +10,7 @@ import ( "github.com/go-martini/martini"
)
-func RegisterRoutes(r martini.Router) {
+func RegisterDebugRoutes(r martini.Router) {
r.Any("/debug/pprof/cmdline", pprof.Cmdline)
r.Any("/debug/pprof/profile", pprof.Profile)
r.Any("/debug/pprof/symbol", pprof.Symbol)
|