diff options
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/pull.go b/models/pull.go index 9dd8737f..3a80cbc1 100644 --- a/models/pull.go +++ b/models/pull.go @@ -321,7 +321,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle pr.HasMerged = true pr.Merged = time.Now() pr.MergerID = doer.ID - if _, err = sess.Id(pr.ID).AllCols().Update(pr); err != nil { + if _, err = sess.ID(pr.ID).AllCols().Update(pr); err != nil { return fmt.Errorf("update pull request: %v", err) } @@ -546,7 +546,7 @@ func GetUnmergedPullRequestsByBaseInfo(repoID int64, branch string) ([]*PullRequ func getPullRequestByID(e Engine, id int64) (*PullRequest, error) { pr := new(PullRequest) - has, err := e.Id(id).Get(pr) + has, err := e.ID(id).Get(pr) if err != nil { return nil, err } else if !has { |