summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-04-30 03:44:42 -0400
committerUnknown <joe2010xtmf@163.com>2014-04-30 03:44:42 -0400
commitde46c06d2ef10c580015cabed67ae8eb17667605 (patch)
tree2fed2acfeda6115f6d66362bc42d1ba66c5cb702 /models
parentb36448a537e67da85d34d47781eeccef3df86ac5 (diff)
parent1e9f376d3dd7a3510010be8c89196edb3f6e2e49 (diff)
downloadgitea-de46c06d2ef10c580015cabed67ae8eb17667605.tar.gz
gitea-de46c06d2ef10c580015cabed67ae8eb17667605.zip
Merge branch 'master' of github.com:gogits/gogs into dev
Diffstat (limited to 'models')
-rw-r--r--models/issue.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/models/issue.go b/models/issue.go
index f14030df5e..26b8cecdd5 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -71,7 +71,7 @@ func CreateIssue(userId, repoId, milestoneId, assigneeId int64, issueCount int,
}
if err = sess.Commit(); err != nil {
- sess.Rollback()
+ //sess.Rollback()
return nil, err
}
@@ -196,7 +196,7 @@ func CreateComment(userId, repoId, issueId, commitId, line int64, cmtType int, c
defer sess.Close()
sess.Begin()
- if _, err := orm.Insert(&Comment{PosterId: userId, Type: cmtType, IssueId: issueId,
+ if _, err := sess.Insert(&Comment{PosterId: userId, Type: cmtType, IssueId: issueId,
CommitId: commitId, Line: line, Content: content}); err != nil {
sess.Rollback()
return err