Преглед на файлове

repo: fix cannot fork repository (#4572)

Should not load attributes if repository not found in HasForkedRepo.
Unknwon преди 7 години
родител
ревизия
dc10594d7b
променени са 3 файла, в които са добавени 5 реда и са изтрити 3 реда
  1. 1 1
      gogs.go
  2. 3 1
      models/repo.go
  3. 1 1
      templates/.VERSION

+ 1 - 1
gogs.go

@@ -16,7 +16,7 @@ import (
 	"github.com/gogits/gogs/pkg/setting"
 )
 
-const APP_VER = "0.11.26.0714"
+const APP_VER = "0.11.27.0718"
 
 func init() {
 	setting.AppVer = APP_VER

+ 3 - 1
models/repo.go

@@ -2262,8 +2262,10 @@ func HasForkedRepo(ownerID, repoID int64) (*Repository, bool, error) {
 	has, err := x.Where("owner_id = ? AND fork_id = ?", ownerID, repoID).Get(repo)
 	if err != nil {
 		return nil, false, err
+	} else if !has {
+		return nil, false, nil
 	}
-	return repo, has, repo.LoadAttributes()
+	return repo, true, repo.LoadAttributes()
 }
 
 // ForkRepository creates a fork of target repository under another user domain.

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.11.26.0714
+0.11.27.0718