The Unified and Autonomous Development Platform
Some bug fixes
Robin Shen1cb79b4b14d0
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.javaindex b4d5b76fb8..d8d7fb83d9 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java@@ -2206,5 +2206,27 @@ public class BuildSpec implements Serializable, Validatable {migrate37_registryLogins((MappingNode)stepNode);});}++ private void migrate38(VersionedYamlDoc doc, Stack<Integer> versions) {+ migrateSteps(doc, versions, stepsNode -> {+ for (var stepNode: stepsNode.getValue()) {+ if (stepNode.getTag().getValue().equals("!RenovateStep")) {+ for (var itStepTuple = ((MappingNode)stepNode).getValue().iterator(); itStepTuple.hasNext();) {+ var stepTuple = itStepTuple.next();+ var keyNode = (ScalarNode) stepTuple.getKeyNode();+ if (keyNode.getValue().equals("createDependencyDashboardIssue")+ || keyNode.getValue().equals("dashboardIssueConfidential")+ || keyNode.getValue().equals("closeDashboardIssueWhenDone")) {+ itStepTuple.remove();+ } else if (keyNode.getValue().equals("dashboardIssueFields")) {+ keyNode.setValue("issueFields");+ } else if (keyNode.getValue().equals("dashboardIssueCloseStates")) {+ keyNode.setValue("issueCloseStates");+ }+ }+ }+ }+ });+ }}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex fbecf52860..e244231376 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -276,7 +276,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>elseauthor = null;if (commitMessage == null)- commitMessage = request.getDefaultCommitMessage();+ commitMessage = request.getDefaultMergeCommitMessage();mergeCommitId = getGitService().amendCommit(project, mergeCommitId,author, person, commitMessage);} else if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS) {@@ -431,7 +431,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>var autoMerge = request.getAutoMerge();if (autoMerge.isEnabled() && request.checkMerge() == null) {if (autoMerge.getUser() != null)- merge(autoMerge.getUser(), request, null);+ merge(autoMerge.getUser(), request, autoMerge.getCommitMessage());elsethrow new ExplicitException("Auto merge user not specified");}diff --git a/server-core/src/main/java/io/onedev/server/git/service/CommitMessageError.java b/server-core/src/main/java/io/onedev/server/git/service/CommitMessageError.javaindex 84566e72b6..ea6ac86e6f 100644--- a/server-core/src/main/java/io/onedev/server/git/service/CommitMessageError.java+++ b/server-core/src/main/java/io/onedev/server/git/service/CommitMessageError.java@@ -3,6 +3,7 @@ package io.onedev.server.git.service;import io.onedev.server.git.GitUtils;import org.eclipse.jgit.lib.ObjectId;+import javax.annotation.Nullable;import java.io.Serializable;import static io.onedev.server.git.GitUtils.abbreviateSHA;@@ -15,11 +16,12 @@ public class CommitMessageError implements Serializable {private final String errorMessage;- public CommitMessageError(ObjectId commitId, String errorMessage) {+ public CommitMessageError(@Nullable ObjectId commitId, String errorMessage) {this.commitId = commitId;this.errorMessage = errorMessage;}+ @Nullablepublic ObjectId getCommitId() {return commitId;}@@ -30,8 +32,12 @@ public class CommitMessageError implements Serializable {@Overridepublic String toString() {- return "Error validating commit message of "- + abbreviateSHA(commitId.name())- + ": " + errorMessage;+ if (commitId != null) {+ return "Error validating commit message of "+ + abbreviateSHA(commitId.name())+ + ": " + errorMessage;+ } else {+ return "Error validating auto merge commit message: " + errorMessage;+ }}}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex 84ce765eb4..023794d1f0 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -41,7 +41,7 @@ import java.util.stream.Collectors;import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;import static io.onedev.server.model.PullRequest.*;import static io.onedev.server.model.support.TimeGroups.*;-import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.*;import static java.lang.ThreadLocal.withInitial;@Entity@@ -322,7 +322,7 @@ public class PullRequest extends ProjectBelongingprivate transient Collection<User> assignees;- private transient Optional<CommitMessageError> commitMessageCheckError;+ private transient Optional<CommitMessageError> commitMessageErrorOpt;public String getTitle() {return title;@@ -1036,13 +1036,14 @@ public class PullRequest extends ProjectBelongingreturn null;}- public String getDefaultCommitMessage() {- if (autoMerge.getCommitMessage() != null) {- return autoMerge.getCommitMessage();+ public String getDefaultMergeCommitMessage() {+ if (getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS) {+ return "Merges pull request #" + getNumber() + "\n\n" + getTitle();} else {- var commitMessage = "Merges pull request #" + getNumber() + "\n\n" + getTitle();+ var commitMessage = getTitle();if (getDescription() != null)commitMessage += "\n\n" + getDescription();+ commitMessage += "\n\n" + "Merges pull request #" + getNumber();return commitMessage;}}@@ -1105,18 +1106,43 @@ public class PullRequest extends ProjectBelongingreturn "Source branch already exists";return null;}-++ public boolean isMergeCommitMessageRequired() {+ if (mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS || mergeStrategy == CREATE_MERGE_COMMIT)+ return true;+ if (mergeStrategy == CREATE_MERGE_COMMIT_IF_NECESSARY) {+ var preview = checkMergePreview();+ if (preview != null && preview.getMergeCommitHash() != null) {+ return !preview.getMergeCommitHash().equals(preview.getHeadCommitHash());+ } else {+ ObjectId requestHead = getLatestUpdate().getHeadCommit().copy();+ ObjectId targetHead = getTarget().getObjectId();+ return !getGitService().isMergedInto(getProject(), null, targetHead, requestHead);+ }+ }+ return false;+ }+@Nullablepublic CommitMessageError checkCommitMessages() {- if (commitMessageCheckError == null) {- if (getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS) {- commitMessageCheckError = Optional.ofNullable(getProject().checkCommitMessages(getTargetBranch(), getSubmitter(),- getBaseCommit().copy(), getLatestUpdate().getHeadCommit().copy(), new HashMap<>()));- } else {- commitMessageCheckError = Optional.empty();+ if (commitMessageErrorOpt == null) {+ CommitMessageError error = null;+ if (mergeStrategy != SQUASH_SOURCE_BRANCH_COMMITS) {+ error = getProject().checkCommitMessages(getTargetBranch(), getSubmitter(),+ getBaseCommit().copy(), getLatestUpdate().getHeadCommit().copy(), new HashMap<>());+ }+ if (error == null && autoMerge.isEnabled() && isMergeCommitMessageRequired()) {+ var branchProtection = getProject().getBranchProtection(getTargetBranch(), autoMerge.getUser());+ var commitMessage = autoMerge.getCommitMessage();+ if (commitMessage == null)+ commitMessage = getDefaultMergeCommitMessage();+ var errorMessage = branchProtection.checkCommitMessage(commitMessage, mergeStrategy != SQUASH_SOURCE_BRANCH_COMMITS);+ if (errorMessage != null)+ error = new CommitMessageError(null, errorMessage);}+ commitMessageErrorOpt = Optional.ofNullable(error);}- return commitMessageCheckError.orElse(null);+ return commitMessageErrorOpt.orElse(null);}public static String getSerialLockName(Long requestId) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.javaindex 761f1101ff..c638a6ec5c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java@@ -30,7 +30,7 @@ public enum MergeStrategy {@Overridepublic ObjectId merge(PullRequest request, String commitMessage) {- ObjectId requestHead = request.getLatestUpdate().getHeadCommit();+ ObjectId requestHead = request.getLatestUpdate().getHeadCommit().copy();ObjectId targetHead = request.getTarget().getObjectId();Project project = request.getTargetProject();if (getGitService().isMergedInto(project, null, targetHead, requestHead)) {diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.javaindex 0ffe005968..83e41d2d24 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java@@ -1,6 +1,5 @@package io.onedev.server.rest.resource;-import io.onedev.commons.utils.ExplicitException;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.UserManager;@@ -21,6 +20,7 @@ import org.apache.shiro.authz.UnauthorizedException;import org.eclipse.jgit.lib.ObjectId;import org.joda.time.DateTime;+import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import javax.validation.constraints.NotEmpty;@@ -34,6 +34,9 @@ import java.util.Collection;import java.util.List;import java.util.stream.Collectors;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;+import static javax.ws.rs.core.Response.Status.NOT_ACCEPTABLE;+@Api(order=3000, description="In most cases, pull request resource is operated with pull request id, which is different from pull request number. "+ "To get pull request id of a particular pull request number, use the <a href='/~help/api/io.onedev.server.rest.PullRequestResource/queryBasicInfo'>Query Basic Info</a> operation with query for "+ "instance <code>"Number" is "path/to/project#100"</code> or <code>"Number" is "PROJECTKEY-100"</code>")@@ -195,7 +198,7 @@ public class PullRequestResource {@Api(order=1200)@POST- public Long create(@NotNull PullRequestOpenData data) {+ public Response create(@NotNull PullRequestOpenData data) {User user = SecurityUtils.getUser();ProjectAndBranch target = new ProjectAndBranch(data.getTargetProjectId(), data.getTargetBranch());@@ -253,8 +256,8 @@ public class PullRequestResource {for (Long reviewerId: data.getReviewerIds()) {User reviewer = userManager.load(reviewerId);- if (reviewer.equals(request.getSubmitter()))- throw new ExplicitException("Pull request submitter can not be reviewer");+ if (reviewer.equals(request.getSubmitter()))+ return Response.status(NOT_ACCEPTABLE).entity("Pull request submitter can not be reviewer").build();if (request.getReview(reviewer) == null) {PullRequestReview review = new PullRequestReview();@@ -281,7 +284,7 @@ public class PullRequestResource {}pullRequestManager.open(request);- return request.getId();+ return Response.ok(request.getId()).build();}@Api(order=1300)@@ -316,6 +319,17 @@ public class PullRequestResource {pullRequestChangeManager.changeMergeStrategy(request, mergeStrategy);return Response.ok().build();}++ @Nullable+ private Response checkAutoMergeCommitMessage(User user, PullRequest request,AutoMergeData data) {+ if (request.isMergeCommitMessageRequired()) {+ var branchProtection = request.getProject().getBranchProtection(request.getTargetBranch(), user);+ var errorMessage = branchProtection.checkCommitMessage(data.getCommitMessage(), request.getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS);+ if (errorMessage != null)+ return Response.status(NOT_ACCEPTABLE).entity("Error validating auto merge commit message: " + errorMessage).build();+ }+ return null;+ }@Api(order=1550)@Path("/{requestId}/auto-merge")@@ -330,8 +344,10 @@ public class PullRequestResource {var autoMerge = new AutoMerge();autoMerge.setEnabled(data.isEnabled());autoMerge.setUser(user);- if (data.getCommitMessage() != null)- autoMerge.setCommitMessage(data.getCommitMessage());+ var response = checkAutoMergeCommitMessage(user, request, data);+ if (response != null)+ return response;+ autoMerge.setCommitMessage(data.getCommitMessage());pullRequestChangeManager.changeAutoMerge(request, autoMerge);} else {throw new UnauthorizedException();@@ -344,21 +360,21 @@ public class PullRequestResource {var autoMerge = new AutoMerge();autoMerge.setEnabled(true);autoMerge.setUser(user);- if (data.getCommitMessage() != null)- autoMerge.setCommitMessage(data.getCommitMessage());- else- autoMerge.setCommitMessage(request.getAutoMerge().getCommitMessage());+ var response = checkAutoMergeCommitMessage(user, request, data);+ if (response != null)+ return response;+ autoMerge.setCommitMessage(data.getCommitMessage());pullRequestChangeManager.changeAutoMerge(request, autoMerge);}} else {- throw new UnsupportedOperationException("Auto merge already disabled");+ return Response.status(NOT_ACCEPTABLE).entity("Auto merge already disabled").build();}} else {throw new UnauthorizedException();}return Response.ok().build();} else {- throw new UnsupportedOperationException("Pull request is closed");+ return Response.status(NOT_ACCEPTABLE).entity("Pull request is closed").build();}}@@ -371,7 +387,7 @@ public class PullRequestResource {throw new UnauthorizedException();String errorMessage = request.checkReopen();if (errorMessage != null)- throw new ExplicitException(errorMessage);+ return Response.status(NOT_ACCEPTABLE).entity(errorMessage).build();pullRequestManager.reopen(request, note);return Response.ok().build();@@ -385,7 +401,7 @@ public class PullRequestResource {if (!SecurityUtils.canModifyPullRequest(request))throw new UnauthorizedException();if (!request.isOpen())- throw new ExplicitException("Pull request already closed");+ return Response.status(NOT_ACCEPTABLE).entity("Pull request already closed").build();pullRequestManager.discard(request, note);return Response.ok().build();@@ -401,7 +417,14 @@ public class PullRequestResource {throw new UnauthorizedException();String errorMessage = request.checkMerge();if (errorMessage != null)- throw new ExplicitException(errorMessage);+ return Response.status(NOT_ACCEPTABLE).entity(errorMessage).build();++ if (request.isMergeCommitMessageRequired()) {+ var branchProtection = request.getProject().getBranchProtection(request.getTargetBranch(), user);+ errorMessage = branchProtection.checkCommitMessage(note, request.getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS);+ if (errorMessage != null)+ return Response.status(NOT_ACCEPTABLE).entity("Error validating merge commit message: " + errorMessage).build();+ }pullRequestManager.merge(user, request, note);return Response.ok().build();@@ -420,7 +443,7 @@ public class PullRequestResource {String errorMessage = request.checkDeleteSourceBranch();if (errorMessage != null)- throw new ExplicitException(errorMessage);+ return Response.status(NOT_ACCEPTABLE).entity(errorMessage).build();pullRequestManager.deleteSourceBranch(request, note);return Response.ok().build();@@ -439,7 +462,7 @@ public class PullRequestResource {String errorMessage = request.checkRestoreSourceBranch();if (errorMessage != null)- throw new ExplicitException(errorMessage);+ return Response.status(NOT_ACCEPTABLE).entity(errorMessage).build();pullRequestManager.restoreSourceBranch(request, note);return Response.ok().build();diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.javaindex fe3a96e2fb..8f2b9612e5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java@@ -72,7 +72,11 @@ abstract class BeanEditContentPanel extends Panel {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- onSave(target);+ var errorMessage = onSave(target);+ if (errorMessage != null) {+ form.error(errorMessage);+ target.add(BeanEditContentPanel.this);+ }}});@@ -118,7 +122,7 @@ abstract class BeanEditContentPanel extends Panel {@Nullableprotected abstract String getTitle();- protected abstract void onSave(AjaxRequestTarget target);+ protected abstract String onSave(AjaxRequestTarget target);protected abstract void onCancel(AjaxRequestTarget target);diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.javaindex 5849fe204d..09fc61c5cd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java@@ -49,8 +49,8 @@ public abstract class BeanEditModalPanel<T extends Serializable> extends ModalPa}@Override- protected void onSave(AjaxRequestTarget target) {- BeanEditModalPanel.this.onSave(target, bean);+ protected String onSave(AjaxRequestTarget target) {+ return BeanEditModalPanel.this.onSave(target, bean);}@Override@@ -86,7 +86,7 @@ public abstract class BeanEditModalPanel<T extends Serializable> extends ModalPareturn true;}- protected abstract void onSave(AjaxRequestTarget target, T bean);+ protected abstract String onSave(AjaxRequestTarget target, T bean);protected void onCancel(AjaxRequestTarget target) {}diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex 7630012add..65f15711f9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -206,7 +206,7 @@ public abstract class CodeCommentListPanel extends Panel {}@Override- protected void onSave(AjaxRequestTarget target, StatusChangeOptionBean bean) {+ protected String onSave(AjaxRequestTarget target, StatusChangeOptionBean bean) {Collection<CodeCommentStatusChange> changes = new ArrayList<>();for (CodeComment comment: commentsProvider.get()) {@@ -228,6 +228,8 @@ public abstract class CodeCommentListPanel extends Panel {target.add(body);close();++ return null;}};diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 8b85cdf3fe..519e47ed8b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -449,7 +449,7 @@ public abstract class RevisionDiffPanel extends Panel {}@Override- protected void onSave(AjaxRequestTarget target, SuggestionBatchApplyBean bean) {+ protected String onSave(AjaxRequestTarget target, SuggestionBatchApplyBean bean) {String commitMessage = bean.getCommitMessage();PullRequest request = getPullRequest();ObjectId commitId = request.getLatestUpdate().getHeadCommit().copy();@@ -477,6 +477,7 @@ public abstract class RevisionDiffPanel extends Panel {throw ExceptionUtils.unchecked(e);}}+ return null;}};dropdown.close();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex 4763f56894..d40f3d445b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -147,13 +147,14 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, Pro}@Override- protected void onSave(AjaxRequestTarget target, Serializable bean) {+ protected String onSave(AjaxRequestTarget target, Serializable bean) {fieldValues.putAll(FieldUtils.getFieldValues(FieldUtils.newBeanComponentContext(beanDescriptor, bean),bean, FieldUtils.getEditableFields(getProject(), dependentFields)));OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldValues);notifyObservablesChange(target);close();+ return null;}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.javaindex 5b13ad1c34..757b64d23c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java@@ -96,10 +96,11 @@ abstract class TimingDetailPanel extends Panel {new BeanEditModalPanel<>(target, bean) {@Override- protected void onSave(AjaxRequestTarget target, EstimatedTimeEditBean bean) {+ protected String onSave(AjaxRequestTarget target, EstimatedTimeEditBean bean) {getIssueChangeManager().changeOwnEstimatedTime(getIssue(), bean.getEstimatedTime());notifyObservablesChange(target);close();+ return null;}};}@@ -121,7 +122,7 @@ abstract class TimingDetailPanel extends Panel {new BeanEditModalPanel<>(target, bean) {@Override- protected void onSave(AjaxRequestTarget target, IssueWorkBean bean) {+ protected String onSave(AjaxRequestTarget target, IssueWorkBean bean) {IssueWork work = new IssueWork();work.setIssue(getIssue());work.setUser(SecurityUtils.getAuthUser());@@ -132,6 +133,7 @@ abstract class TimingDetailPanel extends Panel {OneDev.getInstance(IssueWorkManager.class).createOrUpdate(work);notifyObservablesChange(target);close();+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.javaindex 2ee7ecebda..c9fcd8236e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java@@ -42,7 +42,7 @@ public abstract class SuggestionApplyModalPanel extends BeanEditModalPanel<Sugge}@Override- protected void onSave(AjaxRequestTarget target, SuggestionApplyBean bean) {+ protected String onSave(AjaxRequestTarget target, SuggestionApplyBean bean) {CodeComment comment = getComment();BlobEdits blobEdits = new BlobEdits();@@ -116,6 +116,7 @@ public abstract class SuggestionApplyModalPanel extends BeanEditModalPanel<SuggeSession.get().error("Suggestion apply disallowed by branch protection rule");close();}+ return null;}@Nullablediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.javaindex 38d221b57b..63d5a8c52a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java@@ -180,11 +180,12 @@ abstract class JobExecutorEditPanel extends Panel {}@Override- protected void onSave(AjaxRequestTarget target, Serializable bean) {+ protected String onSave(AjaxRequestTarget target, Serializable bean) {close();target.add(editor);target.focusComponent(null);submitTask(target);+ return null;}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 580dd55d86..48845b33ff 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -294,12 +294,13 @@ public abstract class BuildDetailPage extends ProjectPagenew BeanEditModalPanel<Serializable>(target, bean) {@Override- protected void onSave(AjaxRequestTarget target, Serializable bean) {+ protected String onSave(AjaxRequestTarget target, Serializable bean) {getBuild().setDescription(((DescriptionBean)bean).getValue());OneDev.getInstance(BuildManager.class).update(getBuild());OneDev.getInstance(ListenerRegistry.class).post(new BuildUpdated(getBuild()));((BasePage)getPage()).notifyObservablesChange(target, getBuild().getChangeObservables());close();+ return null;}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.javaindex e1faa7af96..ecbe450e2e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java@@ -124,7 +124,7 @@ abstract class AbstractColumnPanel extends Panel implements EditContext {new BeanEditModalPanel<>(target, bean) {@Override- protected void onSave(AjaxRequestTarget target, AddToIterationBean bean) {+ protected String onSave(AjaxRequestTarget target, AddToIterationBean bean) {BasePage page = (BasePage) getPage();close();var issues = getIssueManager().query(getProjectScope(), getQuery(),@@ -138,6 +138,7 @@ abstract class AbstractColumnPanel extends Panel implements EditContext {getIssueChangeManager().changeSchedule(issues, addIteration, removeIteration, bean.isSendNotifications());for (var issue : issues)page.notifyObservablesChange(target, issue.getChangeObservables(true));+ return null;}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 59df8d25d8..3a046e11b0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -479,7 +479,7 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {}@Override- protected void onSave(AjaxRequestTarget target, Serializable bean) {+ protected String onSave(AjaxRequestTarget target, Serializable bean) {fieldValues.putAll(FieldUtils.getFieldValues(FieldUtils.newBeanComponentContext(beanDescriptor, bean),bean, FieldUtils.getEditableFields(getProject(), dependentFields)));@@ -487,6 +487,7 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {Issue issue = getIssueManager().load(issueId);getIssueChangeManager().changeFields(issue, fieldValues);cardListPanel.onCardDropped(target, issueId, cardIndex, true);+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 3abe05db5c..c2dd2b8cef 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -572,13 +572,14 @@ public class IssueBoardsPage extends ProjectIssuesPage {new BeanEditModalPanel<>(target, bean, "Edit Iteration") {@Override- protected void onSave(AjaxRequestTarget target, IterationEditBean bean) {+ protected String onSave(AjaxRequestTarget target, IterationEditBean bean) {var iteration = item.getModelObject();bean.update(iteration);getIterationManager().createOrUpdate(iteration);setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), getBoard(), new IterationSelection.Specified(iteration),backlog, queryString, backlogQueryString));+ return null;}};}@@ -666,7 +667,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {new BeanEditModalPanel<>(target, bean, "Create Iteration") {@Override- protected void onSave(AjaxRequestTarget target, IterationEditBean bean) {+ protected String onSave(AjaxRequestTarget target, IterationEditBean bean) {var iteration = new Iteration();iteration.setProject(getProject());bean.update(iteration);@@ -674,6 +675,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), getBoard(), new IterationSelection.Specified(iteration),backlog, queryString, backlogQueryString));+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex f09448a636..bb67b668b1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -602,11 +602,16 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected String load() {var commitMessageError = getPullRequest().checkCommitMessages();if (commitMessageError != null) {- var params = CommitDetailPage.paramsOf(getProject(), commitMessageError.getCommitId().name());- return String.format("Error validating commit message of <a href='%s' class='text-monospace font-size-sm'>%s</a>: %s",- RequestCycle.get().urlFor(CommitDetailPage.class, params),- GitUtils.abbreviateSHA(commitMessageError.getCommitId().name()),- escapeHtml5(commitMessageError.getErrorMessage()));+ if (commitMessageError.getCommitId() != null) {+ var params = CommitDetailPage.paramsOf(getProject(), commitMessageError.getCommitId().name());+ return String.format("Error validating commit message of <a href='%s' class='text-monospace font-size-sm'>%s</a>: %s",+ RequestCycle.get().urlFor(CommitDetailPage.class, params),+ GitUtils.abbreviateSHA(commitMessageError.getCommitId().name()),+ escapeHtml5(commitMessageError.getErrorMessage()));+ } else {+ return String.format("Error validating auto merge commit message: %s",+ escapeHtml5(commitMessageError.getErrorMessage()));+ }} else {return null;}@@ -1257,11 +1262,12 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected void onBeforeRender() {Fragment tipsContainer;- var autoMerge = getPullRequest().getAutoMerge();+ var request = getPullRequest();+ var autoMerge = request.getAutoMerge();if (autoMerge.isEnabled()) {tipsContainer = new Fragment("tips", "autoMergeEnabledFrag", PullRequestDetailPage.this);WebMarkupContainer link;- if (getPullRequest().getMergeStrategy() != REBASE_SOURCE_BRANCH_COMMITS) {+ if (request.isMergeCommitMessageRequired()) {if (SecurityUtils.canManagePullRequests(getProject())|| autoMerge.getUser() != null && autoMerge.getUser().equals(SecurityUtils.getUser())) {link = new AjaxLink<Void>("commitMessage") {@@ -1271,13 +1277,27 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRvar bean = new CommitMessageBean();bean.setCommitMessage(autoMerge.getCommitMessage());new BeanEditModalPanel<>(target, bean, "Preset Commit Message") {+ @Override+ protected String getCssClass() {+ return "modal-lg commit-message no-autosize";+ }@Override- protected void onSave(AjaxRequestTarget target, CommitMessageBean bean) {- autoMerge.setCommitMessage(bean.getCommitMessage());- getPullRequestChangeManager().changeAutoMerge(getPullRequest(), autoMerge);- Session.get().success("Preset commit message updated");- close();+ protected String onSave(AjaxRequestTarget target, CommitMessageBean bean) {+ var request = getPullRequest();+ var branchProtection = getProject().getBranchProtection(request.getTargetBranch(), autoMerge.getUser());+ var errorMessage = branchProtection.checkCommitMessage(bean.getCommitMessage(),+ request.getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS);+ if (errorMessage != null) {+ return errorMessage;+ } else {+ autoMerge.setCommitMessage(bean.getCommitMessage());+ getPullRequestChangeManager().changeAutoMerge(request, autoMerge);+ Session.get().success("Preset commit message updated");+ close();+ getPullRequestManager().checkAutoMerge(request);+ return null;+ }}};}@@ -1351,41 +1371,58 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected void onUpdate(AjaxRequestTarget target) {var request = getPullRequest();if (autoMergeEnabled.get()) {- if (request.getMergeStrategy() != REBASE_SOURCE_BRANCH_COMMITS) {- var bean = new CommitMessageBean();- bean.setCommitMessage(request.getDefaultCommitMessage());- new BeanEditModalPanel<>(target, bean, "Preset Commit Message") {-- @Override- protected void onSave(AjaxRequestTarget target, CommitMessageBean bean) {- var autoMerge = new AutoMerge();- autoMerge.setEnabled(true);- autoMerge.setUser(SecurityUtils.getUser());- autoMerge.setCommitMessage(bean.getCommitMessage());- getPullRequestChangeManager().changeAutoMerge(getPullRequest(), autoMerge);- target.add(autoMergeContainer);- close();- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- super.onCancel(target);- target.add(autoMergeContainer);- }-- @Override- protected boolean isDirtyAware() {- return false;- }- };- } else {- var autoMerge = new AutoMerge();- autoMerge.setEnabled(true);- autoMerge.setUser(SecurityUtils.getUser());- autoMerge.setCommitMessage(request.getAutoMerge().getCommitMessage());- getPullRequestChangeManager().changeAutoMerge(request, autoMerge);- target.add(autoMergeContainer);- }+ if (request.isMergeCommitMessageRequired()) {+ var bean = new CommitMessageBean();+ bean.setCommitMessage(request.getAutoMerge().getCommitMessage());+ if (bean.getCommitMessage() == null)+ bean.setCommitMessage(request.getDefaultMergeCommitMessage());+ new BeanEditModalPanel<>(target, bean, "Preset Commit Message") {++ @Override+ protected String getCssClass() {+ return "modal-lg commit-message no-autosize";+ }++ @Override+ protected String onSave(AjaxRequestTarget target, CommitMessageBean bean) {+ var request = getPullRequest();+ var user = SecurityUtils.getUser();+ var branchProtection = getProject().getBranchProtection(request.getTargetBranch(), user);+ var errorMessage = branchProtection.checkCommitMessage(bean.getCommitMessage(),+ request.getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS);+ if (errorMessage != null) {+ return errorMessage;+ } else {+ var autoMerge = new AutoMerge();+ autoMerge.setEnabled(true);+ autoMerge.setUser(user);+ autoMerge.setCommitMessage(bean.getCommitMessage());+ getPullRequestChangeManager().changeAutoMerge(getPullRequest(), autoMerge);+ target.add(autoMergeContainer);+ close();+ return null;+ }+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ super.onCancel(target);+ target.add(autoMergeContainer);+ }++ @Override+ protected boolean isDirtyAware() {+ return false;+ }+ };+ } else {+ var autoMerge = new AutoMerge();+ autoMerge.setEnabled(true);+ autoMerge.setUser(SecurityUtils.getUser());+ autoMerge.setCommitMessage(request.getAutoMerge().getCommitMessage());+ getPullRequestChangeManager().changeAutoMerge(request, autoMerge);+ target.add(autoMergeContainer);+ }} else {var autoMerge = new AutoMerge();autoMerge.setCommitMessage(request.getAutoMerge().getCommitMessage());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.javaindex 56ed75700b..fa9c6a7e4c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java@@ -33,14 +33,17 @@ public abstract class MergeConfirmPanel extends OperationConfirmPanel {String description = null;MergeStrategy mergeStrategy = request.getMergeStrategy();MergePreview mergePreview = request.checkMergePreview();- if (mergeStrategy == CREATE_MERGE_COMMIT || mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS)- commitMessage = request.getDefaultCommitMessage();- else if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS)+ if (mergeStrategy == CREATE_MERGE_COMMIT || mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS) {+ commitMessage = request.getAutoMerge().getCommitMessage();+ if (commitMessage == null)+ commitMessage = request.getDefaultMergeCommitMessage();+ } else if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS) {description = "Source branch commits will be rebased onto target branch";- else if (mergePreview.getMergeCommitHash().equals(mergePreview.getHeadCommitHash()))+ } else if (mergePreview.getMergeCommitHash().equals(mergePreview.getHeadCommitHash())) {description = "Source branch commits will be fast-forwarded to target branch";- else- commitMessage = request.getDefaultCommitMessage();+ } else {+ commitMessage = request.getDefaultMergeCommitMessage();+ }getForm().add(new Label("description", description).setVisible(description != null));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmCssResourceReference.javadeleted file mode 100644index 2973d6c3e0..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class OperationConfirmCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public OperationConfirmCssResourceReference() {- super(OperationConfirmCssResourceReference.class, "operation-confirm.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.javaindex 780ff8eb24..8876a823e0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java@@ -1,5 +1,12 @@package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.PullRequestUpdateManager;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;@@ -7,20 +14,10 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.feedback.FeedbackMessage;import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.PullRequestUpdateManager;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestUpdate;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;import org.unbescape.html.HtmlEscape;import javax.annotation.Nullable;@@ -135,12 +132,6 @@ public abstract class OperationConfirmPanel extends Panel {setOutputMarkupId(true);}-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new OperationConfirmCssResourceReference()));- }@Nullableprotected abstract String operate(AjaxRequestTarget target);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/operation-confirm.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/operation-confirm.cssdeleted file mode 100644index 71606f7646..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/operation-confirm.css+++ /dev/null@@ -1,3 +0,0 @@-.pull-request-operation-confirm .commit-message textarea {- height: 360px;-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex 8474e2188d..456aca2cd6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -107,3 +107,6 @@ ul>li>a.code-comments.new .icon {.pull-request-detail .more-info .submission tr:last-child td {padding-bottom: 0;}+.modal-dialog.commit-message textarea, .modal-dialog .commit-message textarea {+ height: 360px;+}diff --git a/server-ee b/server-eeindex cc0ea4257f..1e8f187757 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit cc0ea4257f8a76087041b7784c141a1efbdc4978+Subproject commit 1e8f187757ab4cd4e6a14a8c2feedbdd707f5c16