The Unified and Autonomous Development Platform
Use "do not merge" strategy if no reviews is required when creating pull request
Robin Shencc5dd4def5cc
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.htmlindex 3a49d01d5e..fb339a804d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html@@ -81,6 +81,7 @@<select wicket:id="select" class="form-control"></select><div wicket:id="help" class="help-block"></div><div wicket:id="status" class="status"></div>+ <div wicket:id="mergeWithoutReviewNote" class="alert alert-warning merge-without-review"></div></td></tr><tr class="reviewers">diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 909096cd3d..c88ff13f49 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -185,7 +185,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {if (request.isAllReviewsApproved())request.setMergeStrategy(MergeStrategy.DO_NOT_MERGE);else- request.setMergeStrategy(MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY);+ request.setMergeStrategy(MergeStrategy.CREATE_MERGE_COMMIT);}requestModel = new LoadableDetachableModel<PullRequest>() {@@ -717,6 +717,18 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {});+ container.add(new Label("mergeWithoutReviewNote", "This pull request will be merged into target branch automatically "+ + "as it is submitted by qualified user. Use strategy \"Do Not Merge\" if you want to review without "+ + "merging now") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPullRequest().isAllReviewsApproved() && getPullRequest().getMergeStrategy() != MergeStrategy.DO_NOT_MERGE);+ }++ });+container.setOutputMarkupId(true);return container;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.cssindex 0364237b0a..bcffc39cc6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css@@ -110,3 +110,7 @@width: 24px;height: 24px;}+#new-request>.status>.can-send .merge-strategy .merge-without-review {+ margin-top: 20px;+ margin-bottom: 0;+}