work on #1570

diff --git a/README.md b/README.md
index 2e3f0ea0f1c8ad0844ebff02b1e5aba9462864af..c4560b1dc01162d52c2d381d8b23ec019d9628fc 100644 (file)
--- 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
 
 <table>
     <tr>

diff --git a/gogs.go b/gogs.go
index 3247a1496ddeea8ff112db6d9a2471b3606dbd08..16de8ebed4bdd795e8ef20ebbb54165efc18aa65 100644 (file)
--- 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 cda0c0b98a8884a6b8ac85e2158c173a494f94f9..346eb6473618744b664655d30d78b042fe62942b 100644 (file)
--- 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 d051aed4241e0a137307d461edc56ff42ccd5b6a..3a74bbe0007e491652ec9a036f9d6959fe1a456d 100644 (file)
--- 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 3842c48038dbc51573933f7eef2cb007d3bc3842..355087e4b7659c9701c4d85df590144738167543 100644 (file)
--- 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