From 7786cb76f3bfc87f92aaae5cc70cbfa974b76868 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Tue, 15 Dec 2015 21:32:17 -0500 Subject: [PATCH] fix #2205 --- README.md | 2 +- conf/locale/TRANSLATORS | 3 +++ gogs.go | 2 +- models/repo.go | 16 ++++++++++------ templates/.VERSION | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index ae279c9452..eb6b2d796e 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 version: 0.8.5 +##### Current version: 0.8.6 | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS index 4ac4180e90..2d3a254951 100644 --- a/conf/locale/TRANSLATORS +++ b/conf/locale/TRANSLATORS @@ -2,6 +2,7 @@ # Entries are in alphabetical order. Akihiro YAGASAKI +Aleksejs Grocevs Alexander Steinhöfer Alexandre Magno Andrey Nering @@ -10,7 +11,9 @@ Barış Arda Yılmaz Christoph Kisfeld Cysioland Daniel Speichert +David Yzaguirre Dmitriy Nogay +Ezequiel Gonzalez Rial Gregor Santner Hamid Feizabadi Huimin Wang diff --git a/gogs.go b/gogs.go index 85255299da..03a98f0911 100644 --- a/gogs.go +++ b/gogs.go @@ -18,7 +18,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.8.5.1214" +const APP_VER = "0.8.6.1215" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/repo.go b/models/repo.go index 82e3463377..976dcabf59 100644 --- a/models/repo.go +++ b/models/repo.go @@ -129,6 +129,8 @@ func NewRepoContext() { log.Fatal(4, "Fail to execute 'git config --global core.quotepath false': %s", stderr) } + // Clean up temporary data. + os.RemoveAll(filepath.Join(setting.AppDataPath, "tmp")) } // Repository represents a git repository. @@ -1301,12 +1303,14 @@ func DeleteRepository(uid, repoID int64) error { } } - wikiPath := repo.WikiPath() - if err = os.RemoveAll(wikiPath); err != nil { - desc := fmt.Sprintf("delete repository wiki [%s]: %v", wikiPath, err) - log.Warn(desc) - if err = CreateRepositoryNotice(desc); err != nil { - log.Error(4, "CreateRepositoryNotice: %v", err) + wikiPaths := []string{repo.WikiPath(), repo.LocalWikiPath()} + for _, wikiPath := range wikiPaths { + if err = os.RemoveAll(wikiPath); err != nil { + desc := fmt.Sprintf("delete repository wiki [%s]: %v", wikiPath, err) + log.Warn(desc) + if err = CreateRepositoryNotice(desc); err != nil { + log.Error(4, "CreateRepositoryNotice: %v", err) + } } } diff --git a/templates/.VERSION b/templates/.VERSION index 51625d877c..5bd084a800 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.8.5.1214 \ No newline at end of file +0.8.6.1215 \ No newline at end of file