aboutsummaryrefslogtreecommitdiff
path: root/models/pull.go
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-06-11 03:06:36 -0400
committerUnknwon <u@gogs.io>2017-06-11 03:06:36 -0400
commit0e6a6bf880f950dfc46545b4172bfa980dd6d505 (patch)
tree9e21dee1da616324676f224d37ca740e2f8f1e55 /models/pull.go
parente1f01305d8fcd93504db4fecbbbcbec0c8f7e970 (diff)
Refactoring: remove sessionRelease()
XORM supports automatic roll back in session Close() already.
Diffstat (limited to 'models/pull.go')
-rw-r--r--models/pull.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/models/pull.go b/models/pull.go
index b2a7b44c..27a843d5 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -192,7 +192,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
}()
sess := x.NewSession()
- defer sessionRelease(sess)
+ defer sess.Close()
if err = sess.Begin(); err != nil {
return err
}
@@ -382,7 +382,7 @@ func (pr *PullRequest) testPatch() (err error) {
// NewPullRequest creates new pull request with labels for repository.
func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []string, pr *PullRequest, patch []byte) (err error) {
sess := x.NewSession()
- defer sessionRelease(sess)
+ defer sess.Close()
if err = sess.Begin(); err != nil {
return err
}