The Unified and Autonomous Development Platform
feat: Add coding agent commit message suggestion for issue fix (OD-2802)
Robin Shen0152f702ea1f
diff --git a/server-core/src/main/java/io/onedev/server/ai/TodResource.java b/server-core/src/main/java/io/onedev/server/ai/TodResource.javaindex 4556e3c72b..86add362b7 100644--- a/server-core/src/main/java/io/onedev/server/ai/TodResource.java+++ b/server-core/src/main/java/io/onedev/server/ai/TodResource.java@@ -356,23 +356,10 @@ public class TodResource {requirementBuilder.append("\nExplanation: ").append(checker.getExplanation());}- var fixPatternEntries = settingService.getIssueSetting().getCommitMessageFixPatterns().getEntries();- if (!fixPatternEntries.isEmpty()) {- if (requirementBuilder.length() != 0)- requirementBuilder.append("\n\n");- requirementBuilder.append("When a commit closes/fixes/resolves an issue, mention the issue reference by enclosing it ")- .append("with one of these prefix/suffix pattern pairs:");- for (var entry : fixPatternEntries) {- var prefix = entry.getPrefix();- var suffix = entry.getSuffix();- requirementBuilder.append("\n- prefix pattern: ")- .append(prefix != null? prefix: "")- .append("\n suffix pattern: ")- .append(suffix != null? suffix: "");- }- requirementBuilder.append("\nIf '<prefix pattern> <issue reference> <suffix pattern>' reads as a complete sentence, ")- .append("put it in the commit message footer.");- }+ var fixSuggestion = settingService.getIssueSetting().getCommitMessageFixSetting().getFixSuggestion();+ if (requirementBuilder.length() != 0)+ requirementBuilder.append("\n\n");+ requirementBuilder.append(fixSuggestion);if (requirementBuilder.length() != 0)return requirementBuilder.toString();diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex eae619510a..f81aef9591 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -66,6 +66,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.User;import io.onedev.server.model.support.TimeGroups;+import io.onedev.server.model.support.issue.CommitMessageFixSetting;import io.onedev.server.service.SettingService;import io.onedev.server.ssh.SshKeyUtils;import io.onedev.server.util.CryptoUtils;@@ -8758,4 +8759,29 @@ public class DataMigrator {}}+ private void migrate227(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("ISSUE")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ var commitMessageFixPatternsElement = valueElement.element("commitMessageFixPatterns");+ commitMessageFixPatternsElement.setName("commitMessageFixSetting");+ commitMessageFixPatternsElement.addElement("fixSuggestion")+ .setText(CommitMessageFixSetting.DEFAULT_FIX_SUGGESTION);+ var entriesElement = commitMessageFixPatternsElement.element("entries");+ entriesElement.setName("fixPatterns");+ for (Element entryElement : entriesElement.elements()) {+ entryElement.setName("io.onedev.server.model.support.issue.CommitMessageFixSetting_-FixPattern");+ }+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }+}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 9a464bcf20..1280b84e92 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@@ -27,7 +27,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.BoardSpec;-import io.onedev.server.model.support.issue.CommitMessageFixPatterns;+import io.onedev.server.model.support.issue.CommitMessageFixSetting;import io.onedev.server.model.support.issue.ExternalIssueTransformers;import io.onedev.server.model.support.issue.IssueTemplate;import io.onedev.server.model.support.issue.NamedIssueQuery;@@ -78,7 +78,7 @@ public class GlobalIssueSetting implements Serializable {private List<IssueTemplate> issueTemplates = new ArrayList<>();- private CommitMessageFixPatterns commitMessageFixPatterns;+ private CommitMessageFixSetting commitMessageFixSetting = new CommitMessageFixSetting();private ExternalIssueTransformers externalIssueTransformers;@@ -265,17 +265,7 @@ public class GlobalIssueSetting implements Serializable {namedQueries.add(new NamedIssueQuery("Open & Unassigned", "\"State\" is \"Open\" and \"Assignees\" is empty"));namedQueries.add(new NamedIssueQuery("Open & Unscheduled", "\"State\" is \"Open\" and \"Iteration\" is empty"));namedQueries.add(new NamedIssueQuery("All", null));-- commitMessageFixPatterns = new CommitMessageFixPatterns();- var entry = new CommitMessageFixPatterns.Entry();- entry.setPrefix("(^|\\W)(fix|fixed|fixes|fixing|resolve|resolved|resolves|resolving|close|closed|closes|closing)[\\s:]+");- entry.setSuffix("(?=$|\\W)");- commitMessageFixPatterns.getEntries().add(entry);- entry = new CommitMessageFixPatterns.Entry();- entry.setPrefix("\\(\\s*");- entry.setSuffix("\\s*\\)\\s*$");- commitMessageFixPatterns.getEntries().add(entry);-+timeTrackingSetting.setAggregationLink("Sub Issues");externalIssueTransformers = new ExternalIssueTransformers();@@ -749,12 +739,12 @@ public class GlobalIssueSetting implements Serializable {@NotNull@Valid- public CommitMessageFixPatterns getCommitMessageFixPatterns() {- return commitMessageFixPatterns;+ public CommitMessageFixSetting getCommitMessageFixSetting() {+ return commitMessageFixSetting;}- public void setCommitMessageFixPatterns(CommitMessageFixPatterns commitMessageFixPatterns) {- this.commitMessageFixPatterns = commitMessageFixPatterns;+ public void setCommitMessageFixSetting(CommitMessageFixSetting commitMessageFixSetting) {+ this.commitMessageFixSetting = commitMessageFixSetting;}@Validdiff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixPatterns.java b/server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixSetting.javasimilarity index 63%rename from server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixPatterns.javarename to server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixSetting.javaindex c1a8cdf478..f0a68ddb3e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixPatterns.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixSetting.java@@ -1,19 +1,9 @@package io.onedev.server.model.support.issue;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.OneDev;-import io.onedev.server.annotation.ClassValidating;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.OmitName;-import io.onedev.server.service.ProjectService;-import io.onedev.server.entityreference.IssueReference;-import io.onedev.server.model.Project;-import io.onedev.server.validation.Validatable;-import io.onedev.server.validation.validator.ProjectKeyValidator;-import io.onedev.server.validation.validator.ProjectPathValidator;+import static io.onedev.server.entityreference.ReferenceUtils.mayContainReferences;+import static java.util.regex.Pattern.CASE_INSENSITIVE;+import static org.unbescape.java.JavaEscape.unescapeJava;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;import java.io.Serializable;import java.util.ArrayList;import java.util.LinkedHashSet;@@ -22,50 +12,97 @@ import java.util.Set;import java.util.regex.Matcher;import java.util.regex.Pattern;-import static io.onedev.server.entityreference.ReferenceUtils.mayContainReferences;-import static java.util.regex.Pattern.CASE_INSENSITIVE;-import static org.unbescape.java.JavaEscape.unescapeJava;+import javax.validation.ConstraintValidatorContext;+import javax.validation.Valid;+import javax.validation.constraints.NotEmpty;+import javax.validation.constraints.NotNull;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.annotation.ClassValidating;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Multiline;+import io.onedev.server.entityreference.IssueReference;+import io.onedev.server.model.Project;+import io.onedev.server.service.ProjectService;+import io.onedev.server.validation.Validatable;+import io.onedev.server.validation.validator.ProjectKeyValidator;+import io.onedev.server.validation.validator.ProjectPathValidator;@Editable@ClassValidating-public class CommitMessageFixPatterns implements Serializable, Validatable {+public class CommitMessageFixSetting implements Serializable, Validatable {+private static final long serialVersionUID = 1L;++ public static final String DEFAULT_FIX_SUGGESTION = """+ When a commit is intended to fix/close/resolve an issue, add the issue reference in the commit message \+ footer as a separate line, for instance:+ Fixes <issue reference>""";++ private String fixSuggestion = DEFAULT_FIX_SUGGESTION;++ private List<FixPattern> fixPatterns = new ArrayList<>();++ private transient List<Pattern> parsedFixPatterns;++ public CommitMessageFixSetting() {+ var fixPattern = new FixPattern();+ fixPattern.setPrefix("(^|\\W)(fix|fixed|fixes|fixing|resolve|resolved|resolves|resolving|close|closed|closes|closing)[\\s:]+");+ fixPattern.setSuffix("(?=$|\\W)");+ fixPatterns.add(fixPattern);+ fixPattern = new FixPattern();+ fixPattern.setPrefix("\\(\\s*");+ fixPattern.setSuffix("\\s*\\)\\s*$");+ fixPatterns.add(fixPattern);+ }- private List<Entry> entries = new ArrayList<>();-- private transient List<Pattern> patterns;+ @Editable(order=100, name="Fix Suggestion", description="Specify how coding agents "+ + "should reference an issue in commit messages when the commit is intended to fix an issue")+ @Multiline+ @NotEmpty+ public String getFixSuggestion() {+ return fixSuggestion;+ }- @Editable- @OmitName- public List<Entry> getEntries() {- return entries;+ public void setFixSuggestion(String fixSuggestion) {+ this.fixSuggestion = fixSuggestion;+ }++ @Editable(order=200, name="Prefix/Suffix Patterns", description="Specify prefix/suffix patterns to detect issues "+ + "to be fixed from commit messages. Each line of the commit message will be matched against "+ + "each entry defined here")+ @NotNull+ @Valid+ public List<FixPattern> getFixPatterns() {+ return fixPatterns;}- public void setEntries(List<Entry> entries) {- this.entries = entries;+ public void setFixPatterns(List<FixPattern> entries) {+ this.fixPatterns = entries;}- private List<Pattern> getPatterns() {- if (patterns == null) {- patterns = new ArrayList<>();- for (var entry: entries) {+ private List<Pattern> getParsedFixPatterns() {+ if (parsedFixPatterns == null) {+ parsedFixPatterns = new ArrayList<>();+ for (var fixPattern: fixPatterns) {var builder = new StringBuilder();- if (entry.getPrefix() != null)- builder.append("(").append(entry.getPrefix()).append(")");+ if (fixPattern.getPrefix() != null)+ builder.append("(").append(fixPattern.getPrefix()).append(")");builder.append(String.format("(issue\\s+)?(((?<projectPath>%s)?#)|(?<projectKey>%s)-)(?<number>\\d+)", unescapeJava(ProjectPathValidator.PATTERN.pattern()), unescapeJava(ProjectKeyValidator.PATTERN.pattern())));- if (entry.getSuffix() != null)- builder.append("(").append(entry.getSuffix()).append(")");- patterns.add(Pattern.compile(builder.toString(), CASE_INSENSITIVE));+ if (fixPattern.getSuffix() != null)+ builder.append("(").append(fixPattern.getSuffix()).append(")");+ parsedFixPatterns.add(Pattern.compile(builder.toString(), CASE_INSENSITIVE));}}- return patterns;+ return parsedFixPatterns;}@Overridepublic boolean isValid(ConstraintValidatorContext context) {boolean isValid = true;int index = 0;- for (var entry: entries) {+ for (var entry: fixPatterns) {if (entry.getPrefix() != null) {try {Pattern.compile(entry.getPrefix());@@ -111,7 +148,7 @@ public class CommitMessageFixPatterns implements Serializable, Validatable {var projectService = OneDev.getInstance(ProjectService.class);for (var line: StringUtils.splitAndTrim(commitMessage, "\n")) {if (mayContainReferences(commitMessage)) {- for (var pattern: getPatterns()) {+ for (var pattern: getParsedFixPatterns()) {Matcher matcher = pattern.matcher(line);while (matcher.find()) {Project project;@@ -135,7 +172,7 @@ public class CommitMessageFixPatterns implements Serializable, Validatable {}@Editable- public static class Entry implements Serializable {+ public static class FixPattern implements Serializable {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.javaindex d649d62eb0..c6cb2c117e 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java@@ -1260,7 +1260,7 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Isspublic Collection<Long> parseFixedIssueIds(Project project, String commitMessage) {Collection<Long> issueIds = new HashSet<>();- for (var reference: getIssueSetting().getCommitMessageFixPatterns().parseFixedIssues(commitMessage, project)) {+ for (var reference: getIssueSetting().getCommitMessageFixSetting().parseFixedIssues(commitMessage, project)) {var referenceProject = reference.getProject();if (referenceProject.isSelfOrAncestorOf(project) || project.isSelfOrAncestorOf(referenceProject)) {Long issueId = getIssueId(referenceProject.getId(), reference.getNumber());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.javaindex 3b1d3bd48c..02a922df83 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@@ -43,7 +43,7 @@ import io.onedev.server.web.page.admin.groupmanagement.authorization.GroupAuthorimport io.onedev.server.web.page.admin.groupmanagement.create.NewGroupPage;import io.onedev.server.web.page.admin.groupmanagement.membership.GroupMembershipsPage;import io.onedev.server.web.page.admin.groupmanagement.profile.GroupProfilePage;-import io.onedev.server.web.page.admin.issuesetting.commitmessagefixpatterns.CommitMessageFixPatternsPage;+import io.onedev.server.web.page.admin.issuesetting.commitmessagefix.CommitMessageFixSettingPage;import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;import io.onedev.server.web.page.admin.issuesetting.externalissuepattern.ExternalIssueTransformersPage;import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;@@ -407,7 +407,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new BasePageMapper("~administration/settings/issue-links", LinkSpecListPage.class));add(new BasePageMapper("~administration/settings/time-tracking", TimeTrackingSettingPage.class));add(new BasePageMapper("~administration/settings/issue-templates", IssueTemplateListPage.class));- add(new BasePageMapper("~administration/settings/commit-message-fix-patterns", CommitMessageFixPatternsPage.class));+ add(new BasePageMapper("~administration/settings/commit-message-fix", CommitMessageFixSettingPage.class));add(new BasePageMapper("~administration/settings/external-issue-transformers", ExternalIssueTransformersPage.class));add(new BasePageMapper("~administration/settings/check-issue-integrity", CheckIssueIntegrityPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefix/CommitMessageFixSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefix/CommitMessageFixSettingPage.htmlnew file mode 100644index 0000000000..cd64c68449--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefix/CommitMessageFixSettingPage.html@@ -0,0 +1,12 @@+<wicket:extend>+ <div class="text-muted mb-4">+ <wicket:svg href="bulb" class="icon"/> <wicket:t>Configure how coding agents should reference fixed issues in commit messages,+ and specify prefix/suffix patterns to detect fixed issues in commit messages.+ </wicket:t>+ </div>+ <form wicket:id="form">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor" class="mb-4"></div>+ <input type="submit" class="btn btn-primary" t:value="Update">+ </form>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefixpatterns/CommitMessageFixPatternsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefix/CommitMessageFixSettingPage.javasimilarity index 68%rename from server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefixpatterns/CommitMessageFixPatternsPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefix/CommitMessageFixSettingPage.javaindex 26c597b443..863d7c3747 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefixpatterns/CommitMessageFixPatternsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefix/CommitMessageFixSettingPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.admin.issuesetting.commitmessagefixpatterns;+package io.onedev.server.web.page.admin.issuesetting.commitmessagefix;import static io.onedev.server.web.translation.Translation._T;@@ -12,15 +12,14 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.data.migration.VersionedXmlDoc;import io.onedev.server.service.SettingService;-import io.onedev.server.model.support.issue.CommitMessageFixPatterns;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;-public class CommitMessageFixPatternsPage extends IssueSettingPage {+public class CommitMessageFixSettingPage extends IssueSettingPage {private String oldAuditContent;- public CommitMessageFixPatternsPage(PageParameters params) {+ public CommitMessageFixSettingPage(PageParameters params) {super(params);}@@ -28,22 +27,22 @@ public class CommitMessageFixPatternsPage extends IssueSettingPage {protected void onInitialize() {super.onInitialize();- CommitMessageFixPatterns patterns = getSetting().getCommitMessageFixPatterns();- oldAuditContent = VersionedXmlDoc.fromBean(patterns).toXML();+ var commitMessageFixSetting = getSetting().getCommitMessageFixSetting();+ oldAuditContent = VersionedXmlDoc.fromBean(commitMessageFixSetting).toXML();Form<?> form = new Form<Void>("form") {@Overrideprotected void onSubmit() {super.onSubmit();- getSetting().setCommitMessageFixPatterns(patterns);- var newAuditContent = VersionedXmlDoc.fromBean(patterns).toXML();+ getSetting().setCommitMessageFixSetting(commitMessageFixSetting);+ var newAuditContent = VersionedXmlDoc.fromBean(commitMessageFixSetting).toXML();getSettingService().saveIssueSetting(getSetting());- auditService.audit(null, "changed commit message fix patterns", oldAuditContent, newAuditContent);+ auditService.audit(null, "changed commit message fix settings", oldAuditContent, newAuditContent);oldAuditContent = newAuditContent;Session.get().success(_T("Settings updated"));}};form.add(new FencedFeedbackPanel("feedback", form));- form.add(BeanContext.edit("editor", patterns));+ form.add(BeanContext.edit("editor", commitMessageFixSetting));add(form);}@@ -53,7 +52,7 @@ public class CommitMessageFixPatternsPage extends IssueSettingPage {@Overrideprotected Component newTopbarTitle(String componentId) {- return new Label(componentId, "<span class='text-truncate'>" + _T("Commit Message Fix Patterns") + "</span>").setEscapeModelStrings(false);+ return new Label(componentId, "<span class='text-truncate'>" + _T("Commit Message Fix Settings") + "</span>").setEscapeModelStrings(false);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefixpatterns/CommitMessageFixPatternsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefixpatterns/CommitMessageFixPatternsPage.htmldeleted file mode 100644index 6ea530e4a7..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefixpatterns/CommitMessageFixPatternsPage.html+++ /dev/null@@ -1,13 +0,0 @@-<wicket:extend>- <div class="text-muted mb-4">- <wicket:svg href="bulb" class="icon"/> <wicket:t>Commit message can be used to fix issues- by prefixing and suffixing issue number with specified pattern. Each line of- the commit message will be matched against each entry defined here to find- issues to be fixed</wicket:t>- </div>- <form wicket:id="form">- <div wicket:id="feedback"></div>- <div wicket:id="editor" class="mb-4"></div>- <input type="submit" class="btn btn-primary" t:value="Update">- </form>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 900a4a6770..2bc43cf7b6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -124,7 +124,7 @@ import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;import io.onedev.server.web.page.admin.groupmanagement.GroupListPage;import io.onedev.server.web.page.admin.groupmanagement.GroupPage;import io.onedev.server.web.page.admin.groupmanagement.create.NewGroupPage;-import io.onedev.server.web.page.admin.issuesetting.commitmessagefixpatterns.CommitMessageFixPatternsPage;+import io.onedev.server.web.page.admin.issuesetting.commitmessagefix.CommitMessageFixSettingPage;import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;import io.onedev.server.web.page.admin.issuesetting.externalissuepattern.ExternalIssueTransformersPage;import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;@@ -281,8 +281,8 @@ public abstract class LayoutPage extends BasePage {}issueSettingMenuItems.add(new SidebarMenuItem.Page(null, _T("Description Templates"),IssueTemplateListPage.class, new PageParameters()));- issueSettingMenuItems.add(new SidebarMenuItem.Page(null, _T("Commit Message Fix Patterns"),- CommitMessageFixPatternsPage.class, new PageParameters()));+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, _T("Commit Message Fix Settings"),+ CommitMessageFixSettingPage.class, new PageParameters()));issueSettingMenuItems.add(new SidebarMenuItem.Page(null, _T("External Issue Transformers"), ExternalIssueTransformersPage.class, new PageParameters()));issueSettingMenuItems.add(new SidebarMenuItem.Page(null, _T("Check Workflow Integrity"),CheckIssueIntegrityPage.class, new PageParameters()));diff --git a/server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixPatternsTest.java b/server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixSettingTest.javasimilarity index 74%rename from server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixPatternsTest.javarename to server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixSettingTest.javaindex ddb89b7b06..76d64ff3b1 100644--- a/server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixPatternsTest.java+++ b/server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixSettingTest.java@@ -12,7 +12,7 @@ import io.onedev.commons.loader.AppLoaderMocker;import io.onedev.server.model.Project;import io.onedev.server.service.ProjectService;-public class CommitMessageFixPatternsTest extends AppLoaderMocker {+public class CommitMessageFixSettingTest extends AppLoaderMocker {@Testpublic void parseFixedIssues() {@@ -26,17 +26,9 @@ public class CommitMessageFixPatternsTest extends AppLoaderMocker {when(projectService.findByKey("TESTPROJ")).thenReturn(project);when(projectService.findByPath("test/project")).thenReturn(project);- var commitMessageFixPatterns = new CommitMessageFixPatterns();- var entry = new CommitMessageFixPatterns.Entry();- entry.setPrefix("(^|\\W)(fix|fixed|fixes|fixing|resolve|resolved|resolves|resolving|close|closed|closes|closing)[\\s:]+");- entry.setSuffix("(?=$|\\W)");- commitMessageFixPatterns.getEntries().add(entry);- entry = new CommitMessageFixPatterns.Entry();- entry.setPrefix("\\(\\s*");- entry.setSuffix("\\s*\\)\\s*$");- commitMessageFixPatterns.getEntries().add(entry);-- var issues = commitMessageFixPatterns.parseFixedIssues("" ++ var commitMessageFixSetting = new CommitMessageFixSetting();++ var issues = commitMessageFixSetting.parseFixedIssues("" +"fix #123,resolve : issue #456 Closing test/project#100 Resolves issue test/project#200\n" +"feat(doc): this is a doc feat ( test/project#300 )\n" +"feat: this is an improvement(UNKNOWN-400)\n" +@@ -60,4 +52,4 @@ public class CommitMessageFixPatternsTest extends AppLoaderMocker {@Overrideprotected void teardown() {}-}\ No newline at end of file+}