From 842770d7fbc72789d6df885da7ec5a2d4070f25f Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Wed, 2 Sep 2015 11:24:55 -0400
Subject: add merger info and news feed

---
 models/issue.go | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'models')

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)
 	}
-- 
cgit v1.2.3