From 38eb000d13d5f082e45da4629914fb3d8e633379 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 3 Sep 2015 08:09:08 -0400 Subject: [PATCH] work on #1570 --- README.md | 2 +- gogs.go | 2 +- models/repo.go | 10 +++++++--- modules/auth/repo_form.go | 2 +- templates/.VERSION | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2e3f0ea0f1..c4560b1dc0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra Gogs (Go Git Service) is a painless self-hosted Git service. -##### Current version: 0.6.8 Beta +##### Current version: 0.6.9 Beta diff --git a/gogs.go b/gogs.go index 3247a1496d..16de8ebed4 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.6.8.0902 Beta" +const APP_VER = "0.6.9.0903 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/repo.go b/models/repo.go index cda0c0b98a..346eb64736 100644 --- a/models/repo.go +++ b/models/repo.go @@ -245,13 +245,17 @@ func (repo *Repository) GetBaseRepo() (err error) { return err } -func (repo *Repository) RepoPath() (string, error) { - if err := repo.GetOwner(); err != nil { +func (repo *Repository) repoPath(e Engine) (string, error) { + if err := repo.getOwner(e); err != nil { return "", err } return RepoPath(repo.Owner.Name, repo.Name), nil } +func (repo *Repository) RepoPath() (string, error) { + return repo.repoPath(x) +} + func (repo *Repository) RepoLink() (string, error) { if err := repo.GetOwner(); err != nil { return "", err @@ -1057,7 +1061,7 @@ func DeleteRepository(uid, repoID int64) error { } // Remove repository files. - repoPath, err := repo.RepoPath() + repoPath, err := repo.repoPath(sess) if err != nil { return fmt.Errorf("RepoPath: %v", err) } diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index d051aed424..3a74bbe000 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -97,7 +97,7 @@ func (f *NewWebhookForm) Validate(ctx *macaron.Context, errs binding.Errors) bin } type NewSlackHookForm struct { - PayloadURL string `binding:"Required` + PayloadURL string `binding:"Required;Url` Channel string `binding:"Required"` Username string IconURL string diff --git a/templates/.VERSION b/templates/.VERSION index 3842c48038..355087e4b7 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.8.0902 Beta \ No newline at end of file +0.6.9.0903 Beta \ No newline at end of file