opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  MergeOp: Fix swapped message and tag parameters for ChangeMessage
  Documentation: rewrite httpd.listenUrl

Change-Id: Ia11ddea20b9dd2150f8aad815a253ab61fccb97e
This commit is contained in:
David Pursehouse
2019-09-30 11:05:20 +09:00
parent 2edcdf23e1 6c95cb4495
commit d604d2cedb
2 changed files with 92 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/submit/MergeOp.java
View File

@@ -922,8 +922,8 @@ public class MergeOp implements AutoCloseable {
change.currentPatchSetId(),
internalUserFactory.create(),
change.getLastUpdatedOn(),
ChangeMessagesUtil.TAG_MERGED,
"Project was deleted.");
"Project was deleted.",
ChangeMessagesUtil.TAG_MERGED);
cmUtil.addChangeMessage(
ctx.getDb(), ctx.getUpdate(change.currentPatchSetId()), msg);