The Unified and Autonomous Development Platform
Document path wildcard match
Robin Shen92020091bd00
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex 132ec4c572..d8ae00e6ed 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -291,7 +291,7 @@ public class Job implements Serializable, Validatable {+ "Artifact files are relative to <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, and may use * or ? for pattern match. "+ "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")- @Patterns(interpolative = true)+ @Patterns(interpolative = true, path=true)@NameOfEmptyValue("No artifacts")public String getArtifacts() {return artifacts;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.javaindex 1da5fc2c8d..a3f1047574 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java@@ -72,7 +72,7 @@ public class JobDependency implements Serializable {+ "from the dependency into <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>. Leave empty to do not retrieve any artifacts. "+ "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")- @Patterns(interpolative = true)+ @Patterns(interpolative = true, path=true)@NameOfEmptyValue("Do not retrieve")public String getArtifacts() {return artifacts;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.javaindex b880c0f562..2b6590591a 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java@@ -26,7 +26,7 @@ public abstract class JobReport implements Serializable {@Editable(order=100, description="Specify files relative to OneDev workspace. Use * or ? for pattern match. "+ "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")- @Patterns(interpolative = true)+ @Patterns(interpolative = true, path=true)@NotEmptypublic String getFilePatterns() {return filePatterns;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.javaindex cebb72f71f..995af00113 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java@@ -104,7 +104,7 @@ public class ProjectDependency implements Serializable {@Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve into <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>. "+ "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")- @Patterns(suggester="suggestArtifacts", interpolative=true)+ @Patterns(suggester="suggestArtifacts", interpolative=true, path=true)@NotEmptypublic String getArtifacts() {return artifacts;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.javaindex cf67b2f629..5f28d1dfd0 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java@@ -31,8 +31,8 @@ public class BranchUpdateTrigger extends JobTrigger {private String paths;@Editable(name="Branches", order=100, description="Optionally specify space-separated branches "- + "to check. Use * or ? for wildcard match. Leave empty to match all branches")- @Patterns(suggester = "suggestBranches")+ + "to check. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave empty to match all branches")+ @Patterns(suggester = "suggestBranches", path=true)@NameOfEmptyValue("Any branch")public String getBranches() {return branches;@@ -48,9 +48,9 @@ public class BranchUpdateTrigger extends JobTrigger {}@Editable(name="Touched Files", order=200,- description="Optionally specify space-separated files to check. Use * or ? for wildcard match. "+ description="Optionally specify space-separated files to check. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Leave empty to match all files")- @Patterns(suggester = "getPathSuggestions")+ @Patterns(suggester = "getPathSuggestions", path=true)@NameOfEmptyValue("Any file")public String getPaths() {return paths;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.javaindex 6ea4bb5dad..0e618e83c6 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java@@ -31,9 +31,9 @@ public class PullRequestTrigger extends JobTrigger {private String paths;@Editable(name="Target Branches", order=100, description="Optionally specify space-separated "- + "target branches of the pull requests to check. Use * or ? for wildcard match. "+ + "target branches of the pull requests to check. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Leave empty to match all branches")- @Patterns(suggester = "suggestBranches")+ @Patterns(suggester = "suggestBranches", path=true)@NameOfEmptyValue("Any branch")public String getBranches() {return branches;@@ -49,9 +49,9 @@ public class PullRequestTrigger extends JobTrigger {}@Editable(name="Touched Files", order=200,- description="Optionally specify space-separated files to check. Use * or ? for wildcard match. "+ description="Optionally specify space-separated files to check. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Leave empty to match all files")- @Patterns(suggester = "getPathSuggestions")+ @Patterns(suggester = "getPathSuggestions", path=true)@NameOfEmptyValue("Any file")public String getPaths() {return paths;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.javaindex 2105f0aa41..f86224dc3e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java@@ -29,8 +29,8 @@ public class TagCreateTrigger extends JobTrigger {private String branches;@Editable(name="Tags", order=100, description="Optionally specify space-separated tags to check. "- + "Use * or ? for wildcard match. Leave empty to match all tags")- @Patterns(suggester="suggestTags")+ + "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave empty to match all tags")+ @Patterns(suggester="suggestTags", path=true)@NameOfEmptyValue("Any tag")public String getTags() {return tags;@@ -47,9 +47,9 @@ public class TagCreateTrigger extends JobTrigger {@Editable(name="On Branches", order=200, description="This trigger will only be applicable "+ "if tagged commit is on branches specified here. Multiple branches should be "- + "separated with spaces. Use * or ? for wildcard match. Leave empty to match all "+ + "separated with spaces. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave empty to match all "+ "branches")- @Patterns(suggester="suggestBranches")+ @Patterns(suggester="suggestBranches", path=true)@NameOfEmptyValue("Any branch")public String getBranches() {return branches;diff --git a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex da6c8f8682..7ae0ad0e6f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -70,8 +70,8 @@ public class BranchProtection implements Serializable {this.enabled = enabled;}- @Editable(order=100, description="Specify space-separated branches to be protected. Use * or ? for wildcard match")- @Patterns(suggester = "suggestBranches")+ @Editable(order=100, description="Specify space-separated branches to be protected. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")+ @Patterns(suggester = "suggestBranches", path=true)@NotEmptypublic String getBranches() {return branches;diff --git a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.javaindex 59800b944b..814b9a1d22 100644--- a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java@@ -33,8 +33,8 @@ public class FileProtection implements Serializable, Validatable {private List<String> jobNames = new ArrayList<>();- @Editable(order=100, description="Specify space-separated paths to be protected. Use * or ? for wildcard match")- @Patterns(suggester = "suggestPaths")+ @Editable(order=100, description="Specify space-separated paths to be protected. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")+ @Patterns(suggester = "suggestPaths", path=true)@NotEmptypublic String getPaths() {return paths;diff --git a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.javaindex 69b3681645..43322b9013 100644--- a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java@@ -43,8 +43,8 @@ public class TagProtection implements Serializable {this.enabled = enabled;}- @Editable(order=100, description="Specify space-separated tags to be protected. Use * or ? for wildcard match")- @Patterns(suggester = "suggestTags")+ @Editable(order=100, description="Specify space-separated tags to be protected. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")+ @Patterns(suggester = "suggestTags", path=true)@NotEmptypublic String getTags() {return tags;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.javaindex 02bde47340..4077fe0d26 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java@@ -91,8 +91,8 @@ public class GroovyScript implements Serializable {}@Editable(order=500, description="Optionally specify space-separated branches allowed to "- + "execute this script. Use * or ? for wildcard match. Leave empty to allow all")- @Patterns+ + "execute this script. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave empty to allow all")+ @Patterns(path=true)@ShowCondition("isCanBeUsedByBuildJobsEnabled")@NameOfEmptyValue("All")public String getAllowedBranches() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.javaindex 39e2382dcc..eff40b10cc 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java@@ -39,9 +39,9 @@ public class ServiceLocator implements Serializable {}@Editable(order=200, name="Applicable Images", description="Optionally specify space-separated "- + "service images applicable for this locator. Use * or ? for wildcard match. Leave "+ + "service images applicable for this locator. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave "+ "empty to match all")- @Patterns+ @Patterns(path=true)@NameOfEmptyValue("All")public String getServiceImages() {return serviceImages;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.javaindex 4bd1e0bdac..79b4318423 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java@@ -51,8 +51,8 @@ public class JobSecret implements Serializable {@Editable(order=300, description=""+ "Optionally specify space-separated branches to authorize.\n"+ "Only builds from authorized branches can access this secret.\n"- + "Use * or ? for wildcard match. Leave empty to authorize all branches")- @Patterns(suggester = "suggestBranches")+ + "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave empty to authorize all branches")+ @Patterns(suggester = "suggestBranches", path=true)@NameOfEmptyValue("All")public String getAuthorizedBranches() {return authorizedBranches;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.javaindex 73e4ad72b2..a50fe280df 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java@@ -21,8 +21,8 @@ public abstract class ActionAuthorization implements Serializable {@Editable(order=1000, description="Action is allowed only if build runs on "+ "specified branches. Multiple branches should be separated with space. "- + "Use * or ? for wildcard match")- @Patterns(suggester = "suggestBranches")+ + "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")+ @Patterns(suggester = "suggestBranches", path=true)@NameOfEmptyValue("All")public String getAuthorizedBranches() {return authorizedBranches;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.javaindex e1980384b9..9aadc6efd7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java@@ -20,8 +20,8 @@ public class CreateTagAuthorization extends ActionAuthorization {private String tagNames;- @Editable(order=100, description="Specify space-separated tag names. Use * or ? for wildcard match")- @Patterns(suggester = "suggestTags")+ @Editable(order=100, description="Specify space-separated tag names. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")+ @Patterns(suggester = "suggestTags", path=true)@NameOfEmptyValue("All")public String getTagNames() {return tagNames;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.javaindex 891712d489..eb0d00bbef 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java@@ -25,8 +25,8 @@ public class BranchUpdateTrigger extends TransitionTrigger {}@Editable(order=200, name="Applicable Branches", description="Optionally specify space-separated branches "- + "applicable for this trigger. Use * or ? for wildcard match")- @Patterns(suggester = "suggestBranches")+ + "applicable for this trigger. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")+ @Patterns(suggester = "suggestBranches", path=true)@NameOfEmptyValue("Any branch")public String getBranches() {return branches;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.javaindex b30f6dfcda..191d5001f9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java@@ -41,8 +41,8 @@ public class BuildSuccessfulTrigger extends TransitionTrigger {}@Editable(order=200, name="Applicable Branches", description="Optionally specify space-separated branches "- + "applicable for this trigger. Use * or ? for wildcard match")- @Patterns(suggester = "suggestBranches")+ + "applicable for this trigger. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")+ @Patterns(suggester = "suggestBranches", path=true)@NameOfEmptyValue("Any branch")public String getBranches() {return branches;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.javaindex f23c546a92..36849e580f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java@@ -27,8 +27,8 @@ public abstract class PullRequestTrigger extends TransitionTrigger {@Editable(name="Target Branches", order=100,description="Optionally specify space-separated target branches of the pull requests to check. "- + "Use * or ? for wildcard match. Leave empty to match all branches")- @Patterns(suggester = "suggestBranches")+ + "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave empty to match all branches")+ @Patterns(suggester = "suggestBranches", path=true)@NameOfEmptyValue("Any branch")public String getBranches() {return branches;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.javaindex 8f76356b56..a93214a61e 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java@@ -1,6 +1,7 @@package io.onedev.server.web.behavior.inputassist;import java.util.List;+import java.util.stream.Collectors;import org.apache.commons.text.StringEscapeUtils;import org.apache.wicket.Component;@@ -14,6 +15,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;import io.onedev.commons.codeassist.InputCompletion;import io.onedev.commons.utils.LinearRange;+import io.onedev.server.OneDev;import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;@SuppressWarnings("serial")@@ -31,7 +33,9 @@ abstract class AssistPanel extends Panel {super(id);this.input = input;this.suggestions = suggestions;- this.hints = hints;+ this.hints = hints.stream()+ .map(it->it.replace("$docRoot", OneDev.getInstance().getDocRoot()))+ .collect(Collectors.toList());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex d14b8ea7e4..dd27bffa30 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -580,7 +580,7 @@ public class RevisionDiffPanel extends Panel {protected List<String> getHints(TerminalExpect terminalExpect) {return Lists.newArrayList("Path containing spaces or starting with dash needs to be quoted",- "Use * or ? for wildcard match"+ "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>");}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.javaindex a182885894..827df8d2b4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java@@ -71,7 +71,7 @@ public class InterpolativePatternsEditSupport implements EditSupport {protected List<String> getHints(TerminalExpect terminalExpect) {return Lists.newArrayList("Pattern containing spaces or starting with dash needs to be quoted",- "Use * or ? for wildcard match");+ patterns.path()? "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>": "Use * or ? for wildcard match");}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.javaindex ed3d2daddd..b945f0cd5a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java@@ -56,7 +56,7 @@ public class PatternsEditSupport implements EditSupport {protected List<String> getHints(TerminalExpect terminalExpect) {return Lists.newArrayList("Pattern containing spaces or starting with dash needs to be quoted",- "Use * or ? for wildcard match"+ patterns.path()? "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>": "Use * or ? for wildcard match");}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Patterns.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Patterns.javaindex b6d0abe16b..23f5f3c01c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Patterns.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Patterns.java@@ -25,4 +25,5 @@ public @interface Patterns {Class<? extends Payload>[] payload() default {};+ boolean path() default false;}diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.javaindex a1df5fd357..0d9a468538 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java@@ -44,7 +44,7 @@ public class JobMarkdownReport extends JobReport {this.reportName = reportName;}- @Editable(order=1100, description="Specify start page of the report relative to <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, for instance: manual/index.md. "+ @Editable(order=1100, description="Specify start page of the report relative to <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, for instance: <tt>manual/index.md</tt>. "+ "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmpty