aboutsummaryrefslogtreecommitdiffstats
path: root/models/pull.go
diff options
context:
space:
mode:
author赵智超 <1012112796@qq.com>2020-04-14 09:06:23 +0800
committerGitHub <noreply@github.com>2020-04-14 09:06:23 +0800
commit281029529bf98218b6c75353f2fce2d74b7ba196 (patch)
treec88354f13b20ddd024b167117c50a57cd11d92b7 /models/pull.go
parent063b1d260fa5559fac0b77c215e8b06a9c083cec (diff)
downloadgitea-281029529bf98218b6c75353f2fce2d74b7ba196.tar.gz
gitea-281029529bf98218b6c75353f2fce2d74b7ba196.zip
ui: Add MergePull comment type instead of close for merge PR (#11058)
Signed-off-by: a1012112796 <1012112796@qq.com> Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'models/pull.go')
-rw-r--r--models/pull.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go
index 02b5e98c49..055f9bbc6e 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -390,7 +390,7 @@ func (pr *PullRequest) SetMerged() (bool, error) {
return false, err
}
- if _, err := pr.Issue.changeStatus(sess, pr.Merger, true); err != nil {
+ if _, err := pr.Issue.changeStatus(sess, pr.Merger, true, true); err != nil {
return false, fmt.Errorf("Issue.changeStatus: %v", err)
}