The Unified and Autonomous Development Platform
Adjust default issue workflow to close issue only when commit fixing the issue is merged to master branch
Robin Shen97a2d13599e2
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 1c9a34c493..502c2c24b8 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@@ -191,8 +191,9 @@ public class GlobalIssueSetting implements Serializable {transition = new TransitionSpec();transition.setFromStates(Lists.newArrayList("Open"));transition.setToState("Closed");- BranchUpdateTrigger branchUpdateTrigger = new BranchUpdateTrigger();- transition.setTrigger(branchUpdateTrigger);+ BranchUpdateTrigger branchUpdate = new BranchUpdateTrigger();+ branchUpdate.setBranches("master");+ transition.setTrigger(branchUpdate);transitionSpecs.add(transition);@@ -211,6 +212,7 @@ public class GlobalIssueSetting implements Serializable {transition.setToState("Released");buildSuccessful = new BuildSuccessfulTrigger();buildSuccessful.setBranches("master");+ buildSuccessful.setJobNames("Release");buildSuccessful.setIssueQuery("fixed in current build");transition.setTrigger(buildSuccessful);