Skip to content

The Unified and Autonomous Development Platform

Fix issue #1079 - Configure default merge strategy for pull requests

Robin Shene68657c69120
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index cb2725aa2f..aa4dda81ef 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -30,6 +30,7 @@ import io.onedev.server.model.support.code.TagProtection;
import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.ProjectIssueSetting;
+import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;
import io.onedev.server.rest.annotation.Api;
@@ -1597,6 +1598,17 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
return PatternSet.parse("**");
}
+
+ public MergeStrategy findDefaultMergeStrategy() {
+ Project current = this;
+ do {
+ if (current.getPullRequestSetting().getDefaultMergeStrategy() != null)
+ return current.getPullRequestSetting().getDefaultMergeStrategy();
+ current = current.getParent();
+ } while (current != null);
+
+ return MergeStrategy.CREATE_MERGE_COMMIT;
+ }
public String getSiteLockName() {
return getSiteLockName(getId());
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
index 85e6498e0c..c8e2fbe1fb 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
@@ -1,23 +1,37 @@
-package io.onedev.server.model.support.pullrequest;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-public class ProjectPullRequestSetting implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private List<NamedPullRequestQuery> namedQueries;
-
- @Nullable
- public List<NamedPullRequestQuery> getNamedQueries() {
- return namedQueries;
- }
-
- public void setNamedQueries(@Nullable List<NamedPullRequestQuery> namedQueries) {
- this.namedQueries = namedQueries;
- }
-
-}
+package io.onedev.server.model.support.pullrequest;
+
+import io.onedev.server.web.editable.annotation.Editable;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+@Editable
+public class ProjectPullRequestSetting implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private List<NamedPullRequestQuery> namedQueries;
+
+ private MergeStrategy defaultMergeStrategy;
+
+ @Nullable
+ public List<NamedPullRequestQuery> getNamedQueries() {
+ return namedQueries;
+ }
+
+ public void setNamedQueries(@Nullable List<NamedPullRequestQuery> namedQueries) {
+ this.namedQueries = namedQueries;
+ }
+
+ @Editable(placeholder = "Inherit from parent", rootPlaceholder = "Create merge commit",
+ description = "Specify default merge strategy of pull requests submitted to this project")
+ public MergeStrategy getDefaultMergeStrategy() {
+ return defaultMergeStrategy;
+ }
+
+ public void setDefaultMergeStrategy(MergeStrategy defaultMergeStrategy) {
+ this.defaultMergeStrategy = defaultMergeStrategy;
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
index 3d9d2c9569..d62881b353 100644
--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.mapper;
import io.onedev.server.web.page.project.setting.code.git.GitPackConfigPage;
+import io.onedev.server.web.page.project.setting.code.pullrequest.PullRequestSettingPage;
import org.apache.wicket.core.request.mapper.ResourceMapper;
import org.apache.wicket.markup.html.pages.BrowserInfoPage;
import org.apache.wicket.protocol.http.WebApplication;
@@ -369,6 +370,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new ProjectPageMapper("${project}/~settings/tag-protection", TagProtectionsPage.class));
add(new ProjectPageMapper("${project}/~settings/code-analysis", CodeAnalysisSettingPage.class));
add(new ProjectPageMapper("${project}/~settings/git-pack-config", GitPackConfigPage.class));
+ add(new ProjectPageMapper("${project}/~settings/pull-request", PullRequestSettingPage.class));
add(new ProjectPageMapper("${project}/~settings/build/job-secrets", JobSecretsPage.class));
add(new ProjectPageMapper("${project}/~settings/build/action-authorizations", ActionAuthorizationsPage.class));
add(new ProjectPageMapper("${project}/~settings/build/build-preserve-rules", BuildPreservationsPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 4e134220af..713f5cb93e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -11,6 +11,7 @@ import javax.persistence.EntityNotFoundException;
import javax.servlet.http.HttpServletResponse;
import io.onedev.server.web.page.project.setting.code.git.GitPackConfigPage;
+import io.onedev.server.web.page.project.setting.code.pullrequest.PullRequestSettingPage;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
@@ -276,12 +277,13 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
TagProtectionsPage.class, TagProtectionsPage.paramsOf(getProject())));
codeSettingMenuItems.add(new SidebarMenuItem.Page(null, "Code Analysis",
CodeAnalysisSettingPage.class, CodeAnalysisSettingPage.paramsOf(getProject())));
-
if (getProject().isCodeManagement()) {
codeSettingMenuItems.add(new SidebarMenuItem.Page(null, "Git Pack Config",
GitPackConfigPage.class, GitPackConfigPage.paramsOf(getProject())));
}
-
+ codeSettingMenuItems.add(new SidebarMenuItem.Page(null, "Pull Request",
+ PullRequestSettingPage.class, PullRequestSettingPage.paramsOf(getProject())));
+
settingMenuItems.add(new SidebarMenuItem.SubMenu(null, "Code", codeSettingMenuItems));
List<SidebarMenuItem> buildSettingMenuItems = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 1417df5a78..8d05316bd5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -276,7 +276,8 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
}
}
}
- request.setMergeStrategy(MergeStrategy.CREATE_MERGE_COMMIT);
+
+ request.setMergeStrategy(target.getProject().findDefaultMergeStrategy());
}
requestModel = new LoadableDetachableModel<PullRequest>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.html
new file mode 100644
index 0000000000..4b07131f11
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.html
@@ -0,0 +1,10 @@
+<wicket:extend>
+ <div class="card">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor"></div>
+ <input class="btn btn-primary dirty-aware" value="Update" type="submit">
+ </form>
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java
new file mode 100644
index 0000000000..573a56dfea
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java
@@ -0,0 +1,62 @@
+package io.onedev.server.web.page.project.setting.code.pullrequest;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.CodeAnalysisSetting;
+import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
+import io.onedev.server.web.page.project.setting.ProjectSettingPage;
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+@SuppressWarnings("serial")
+public class PullRequestSettingPage extends ProjectSettingPage {
+
+ public PullRequestSettingPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ ProjectPullRequestSetting bean = getProject().getPullRequestSetting();
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+
+ getProject().setPullRequestSetting(bean);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ setResponsePage(PullRequestSettingPage.class, PullRequestSettingPage.paramsOf(getProject()));
+ Session.get().success("Pull request setting updated");
+ }
+
+ };
+ form.add(BeanContext.edit("editor", bean));
+
+ add(form);
+ }
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "<span class='text-truncate'>Pull Request Setting</span>").setEscapeModelStrings(false);
+ }
+
+ @Override
+ protected void navToProject(Project project) {
+ if (SecurityUtils.canManage(project))
+ setResponsePage(PullRequestSettingPage.class, paramsOf(project.getId()));
+ else
+ setResponsePage(ProjectDashboardPage.class, ProjectPage.paramsOf(project.getId()));
+ }
+
+}