From cf6d321991735a2891e16066f74a75f51719e99e Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 5 Aug 2016 12:46:26 -0700 Subject: [PATCH] Ignore repository with issue disabled or use external tracker in dashboard issues --- Makefile | 13 +++++++------ README.md | 2 +- gogs.go | 2 +- routers/user/home.go | 3 ++- templates/.VERSION | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 9d09b24d54..2439b16716 100644 --- a/Makefile +++ b/Makefile @@ -16,18 +16,19 @@ NOW = $(shell date -u '+%Y%m%d%I%M%S') .IGNORE: public/css/gogs.css -build: $(GENERATED) - go install $(BUILD_FLAGS) -ldflags '$(LDFLAGS)' -tags '$(TAGS)' - cp '$(GOPATH)/bin/gogs' . - +# FIXME: find a way to ignore /vendor/ and /data/ directories. govet: go tool vet -composites=false -methods=false -structtags=false . -build-dev: $(GENERATED) govet +build: $(GENERATED) govet + go install $(BUILD_FLAGS) -ldflags '$(LDFLAGS)' -tags '$(TAGS)' + cp '$(GOPATH)/bin/gogs' . + +build-dev: $(GENERATED) go install $(BUILD_FLAGS) -tags '$(TAGS)' cp '$(GOPATH)/bin/gogs' . -build-dev-race: $(GENERATED) govet +build-dev-race: $(GENERATED) go install $(BUILD_FLAGS) -race -tags '$(TAGS)' cp '$(GOPATH)/bin/gogs' . diff --git a/README.md b/README.md index fe7d0bb352..b0fb5632b7 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) -##### Current tip version: 0.9.62 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) +##### Current tip version: 0.9.63 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/gogs.go b/gogs.go index dcb92ad2a7..a13353588c 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.62.0805" +const APP_VER = "0.9.63.0805" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/routers/user/home.go b/routers/user/home.go index 95d0b582b5..43d839ffd4 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -220,7 +220,8 @@ func Issues(ctx *context.Context) { showRepos := make([]*models.Repository, 0, len(repos)) for _, repo := range repos { if (isPullList && repo.NumPulls == 0) || - (!isPullList && repo.NumIssues == 0) { + (!isPullList && + (!repo.EnableIssues || repo.EnableExternalTracker || repo.NumIssues == 0)) { continue } diff --git a/templates/.VERSION b/templates/.VERSION index ef9982da04..0db44e5c64 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.62.0805 \ No newline at end of file +0.9.63.0805 \ No newline at end of file