diff options
| author | Unknwon <u@gogs.io> | 2015-09-02 11:24:55 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-09-02 11:24:55 -0400 |
| commit | 842770d7fbc72789d6df885da7ec5a2d4070f25f (patch) | |
| tree | 1b2ff56263f8ae35cb4a0b77011584a566822b6b /models/issue.go | |
| parent | 5da306c0e5a2939b836d5ec00a0984a2c30e0f9f (diff) | |
| download | gitea-842770d7fbc72789d6df885da7ec5a2d4070f25f.tar.gz gitea-842770d7fbc72789d6df885da7ec5a2d4070f25f.zip | |
add merger info and news feed
Diffstat (limited to 'models/issue.go')
| -rw-r--r-- | models/issue.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/models/issue.go b/models/issue.go index fff33cf369..dd6a87ead7 100644 --- a/models/issue.go +++ b/models/issue.go @@ -925,6 +925,8 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error } pr.HasMerged = true + pr.Merged = time.Now() + pr.MergerID = doer.Id if _, err = sess.Id(pr.ID).AllCols().Update(pr); err != nil { return fmt.Errorf("update pull request: %v", err) } |