coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#2700 fix sqlite3 can't create issue with more than one label

This commit is contained in:
Unknwon 2016-02-29 18:45:12 -05:00
parent 42a556a082
commit ea80274229
8 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.bra.toml
View File

@ -1,7 +1,7 @@
[run] [run]
init_cmds = [ init_cmds = [
#["grep", "-rn", "FIXME", "."], #["grep", "-rn", "FIXME", "."],
["make", "build-dev"], ["make", "build-dev", "TAGS=sqlite"],
["./gogs", "web"] ["./gogs", "web"]
] ]
watch_all = true watch_all = true
@ -15,6 +15,6 @@ watch_exts = [".go"]
ignore_files = [".+_test.go"] ignore_files = [".+_test.go"]
build_delay = 1500 build_delay = 1500
cmds = [ cmds = [
["make", "build-dev"], # sqlite cert pam tidb ["make", "build-dev", "TAGS=sqlite"], # cert pam tidb
["./gogs", "web"] ["./gogs", "web"]
] ]

2
README.md
View File

@ -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) ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
##### Current version: 0.8.47 ##### Current version: 0.8.48
| Web | UI | Preview | | Web | UI | Preview |
|:-------------:|:-------:|:-------:| |:-------------:|:-------:|:-------:|

2
conf/app.ini
View File

@ -74,7 +74,7 @@ SSH_ROOT_PATH =
; Directory to create temporary files when test publick key using ssh-keygen, ; Directory to create temporary files when test publick key using ssh-keygen,
; default is system temporary directory. ; default is system temporary directory.
SSH_KEY_TEST_PATH = SSH_KEY_TEST_PATH =
; Path to ssh-keygen, default is 'ssh-keygen' and let shells find out which one to call. ; Path to ssh-keygen, default is 'ssh-keygen' and let shell find out which one to call.
SSH_KEYGEN_PATH = ssh-keygen SSH_KEYGEN_PATH = ssh-keygen
; Indicate whether to check minimum key size with corresponding type ; Indicate whether to check minimum key size with corresponding type
MINIMUM_KEY_SIZE_CHECK = false MINIMUM_KEY_SIZE_CHECK = false

2
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.8.47.0227" const APP_VER = "0.8.48.0229"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

15
models/issue.go
View File

@ -297,20 +297,17 @@ func newIssue(e *xorm.Session, repo *Repository, issue *Issue, labelIDs []int64,
return err return err
} }
var label *Label // During the session, SQLite3 dirver cannot handle retrieve objects after update something.
for _, id := range labelIDs { // So we have to get all needed labels first.
if id == 0 { labels := make([]*Label, 0, len(labelIDs))
continue if err = e.In("id", labelIDs).Find(&labels); err != nil {
return fmt.Errorf("Find all labels: %v", err)
} }
label, err = getLabelByID(e, id) for _, label := range labels {
if err != nil {
return err
}
if err = issue.addLabel(e, label); err != nil { if err = issue.addLabel(e, label); err != nil {
return fmt.Errorf("addLabel: %v", err) return fmt.Errorf("addLabel: %v", err)
} }
} }
if issue.MilestoneID > 0 { if issue.MilestoneID > 0 {

2
models/repo.go
View File

@ -27,7 +27,7 @@ import (
"github.com/mcuadros/go-version" "github.com/mcuadros/go-version"
"gopkg.in/ini.v1" "gopkg.in/ini.v1"
"github.com/gogits/git-module" git "github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/modules/bindata" "github.com/gogits/gogs/modules/bindata"

4
modules/bindata/bindata.go
View File

File diff suppressed because one or more lines are too long

2
templates/.VERSION
View File

@ -1 +1 @@
0.8.47.0227 0.8.48.0229