Browse Source

work on #1570

for-closed-social
Unknwon 9 years ago
parent
commit
38eb000d13
5 changed files with 11 additions and 7 deletions
  1. +1
    -1
      README.md
  2. +1
    -1
      gogs.go
  3. +7
    -3
      models/repo.go
  4. +1
    -1
      modules/auth/repo_form.go
  5. +1
    -1
      templates/.VERSION

+ 1
- 1
README.md View File

@ -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. Gogs (Go Git Service) is a painless self-hosted Git service.
##### Current version: 0.6.8 Beta
##### Current version: 0.6.9 Beta
<table> <table>
<tr> <tr>

+ 1
- 1
gogs.go View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.6.8.0902 Beta"
const APP_VER = "0.6.9.0903 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

+ 7
- 3
models/repo.go View File

@ -245,13 +245,17 @@ func (repo *Repository) GetBaseRepo() (err error) {
return err 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 "", err
} }
return RepoPath(repo.Owner.Name, repo.Name), nil return RepoPath(repo.Owner.Name, repo.Name), nil
} }
func (repo *Repository) RepoPath() (string, error) {
return repo.repoPath(x)
}
func (repo *Repository) RepoLink() (string, error) { func (repo *Repository) RepoLink() (string, error) {
if err := repo.GetOwner(); err != nil { if err := repo.GetOwner(); err != nil {
return "", err return "", err
@ -1057,7 +1061,7 @@ func DeleteRepository(uid, repoID int64) error {
} }
// Remove repository files. // Remove repository files.
repoPath, err := repo.RepoPath()
repoPath, err := repo.repoPath(sess)
if err != nil { if err != nil {
return fmt.Errorf("RepoPath: %v", err) return fmt.Errorf("RepoPath: %v", err)
} }

+ 1
- 1
modules/auth/repo_form.go View File

@ -97,7 +97,7 @@ func (f *NewWebhookForm) Validate(ctx *macaron.Context, errs binding.Errors) bin
} }
type NewSlackHookForm struct { type NewSlackHookForm struct {
PayloadURL string `binding:"Required`
PayloadURL string `binding:"Required;Url`
Channel string `binding:"Required"` Channel string `binding:"Required"`
Username string Username string
IconURL string IconURL string

+ 1
- 1
templates/.VERSION View File

@ -1 +1 @@
0.6.8.0902 Beta
0.6.9.0903 Beta

Loading…
Cancel
Save