archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

fix issue #165 - Fast forward merge doesn't work

Browse Source
This commit is contained in:
Robin Shen 2020-06-30 09:21:20 +08:00
parent 156ad5f805
commit ba55906d6b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java
View File

@ -81,12 +81,16 @@ public abstract class MergeConfirmPanel extends OperationConfirmPanel {
}
public String getCommitMessage() {
StringBuilder builder = new StringBuilder(bean.getSummary());
if (bean.getBody() != null) {
builder.append("\n\n");
builder.append(bean.getBody());
if (bean.getSummary() != null) {
StringBuilder builder = new StringBuilder(bean.getSummary());
if (bean.getBody() != null) {
builder.append("\n\n");
builder.append(bean.getBody());
}
return builder.toString();
} else {
return null;
}
return builder.toString();
}
@Override