The Unified and Autonomous Development Platform
Revert default milestone feature as there is no appropriate place for this setting yet
Robin Shen6823629fe315
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex 6574c493ae..99d4925a91 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -41,7 +41,6 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResoimport io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;-import io.onedev.server.web.editable.annotation.Code;import io.onedev.server.web.editable.annotation.Editable;@Editable@@ -65,8 +64,6 @@ public class GlobalIssueSetting implements Serializable {private List<IssueTemplate> issueTemplates = new ArrayList<>();- private String defaultMilestoneScript;-private boolean reconciled = true;public GlobalIssueSetting() {@@ -614,15 +611,6 @@ public class GlobalIssueSetting implements Serializable {this.issueTemplates = issueTemplates;}- @Code(language=Code.GROOVY)- public String getDefaultMilestoneScript() {- return defaultMilestoneScript;- }-- public void setDefaultMilestoneScript(String defaultMilestoneScript) {- this.defaultMilestoneScript = defaultMilestoneScript;- }-@Nullablepublic NamedIssueQuery getNamedQuery(String name) {for (NamedIssueQuery namedQuery: getNamedQueries()) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex df485a2b6e..f91eec49e7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -2,7 +2,6 @@ package io.onedev.server.web.component.issue.create;import java.io.Serializable;import java.util.Collection;-import java.util.Comparator;import java.util.Date;import java.util.List;import java.util.UUID;@@ -277,10 +276,6 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementissue.setSubmitDate(new Date());issue.setState(getIssueSetting().getInitialStateSpec().getName());issue.setSubmitter(SecurityUtils.getUser());- issue.setMilestone(getProject().getMilestones().stream()- .filter(it -> !it.isClosed() && it.getDueDate() != null)- .min(Comparator.comparing(Milestone::getDueDate))- .orElse(null));if (getTemplate() != null)getTemplate().fill(issue);