The Unified and Autonomous Development Platform
Point doc link to code.onedev.io
Robin Shenb348a2a44f4d
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex de060ba9a4..03984d5a2b 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -319,7 +319,7 @@ public class OneDev extends AbstractPlugin implements Serializable {}public String getDocRoot() {- return "https://github.com/theonedev/onedev/wiki";+ return "https://code.onedev.io/projects/onedev-manual/blob/master";}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.javaindex 856b3b4f4d..dfbeb086a4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java@@ -20,7 +20,7 @@ public class EnvVar implements Serializable {private String value;@Editable(order=100, description="Specify name of the environment variable. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")@VariableName(interpolative = true)@NotEmpty@@ -33,7 +33,7 @@ public class EnvVar implements Serializable {}@Editable(order=200, description="Specify value of the environment variable. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")@NotEmptypublic String getValue() {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 4fb0a50b02..e9943da419 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@@ -112,7 +112,7 @@ public class Job implements Serializable, Validatable {}@Editable(order=110, description="Specify docker image of the job. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")@NotEmptypublic String getImage() {@@ -152,7 +152,7 @@ public class Job implements Serializable, Validatable {@Editable(order=120, name="Commands", description="Specify content of Linux shell script or Windows command batch to execute in above image. "+ "It will be executed under job workspace, which may contain files of your repository and other "+ "dependencies based on your configuration below. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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@Code(language = Code.SHELL, variableProvider="getVariables")@Size(min=1, message="may not be empty")@@ -269,7 +269,7 @@ public class Job implements Serializable, Validatable {@Editable(order=9115, group="Artifacts & Reports", description="Optionally specify files to publish as job artifacts. "+ "Artifact files are relative to job workspace, and may use * or ? for pattern match. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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)@NameOfEmptyValue("No artifacts")@@ -324,7 +324,7 @@ public class Job implements Serializable, Validatable {@Editable(order=9200, name="CPU Requirement", group="Resource Requirements", description="Specify CPU requirement of the job. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")@NotEmptypublic String getCpuRequirement() {@@ -337,7 +337,7 @@ public class Job implements Serializable, Validatable {@Editable(order=9300, group="Resource Requirements", description="Specify memory requirement of the job. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")@NotEmptypublic String getMemoryRequirement() {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 a71076cd50..f3d7c87f5e 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@@ -70,7 +70,7 @@ public class JobDependency implements Serializable {@Editable(order=300, name="Artifacts to Retrieve", description="Optionally specify artifacts to retrieve "+ "from the dependency into job workspace. Leave empty to do not retrieve any artifacts. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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)@NameOfEmptyValue("Do not retrieve")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 f51d137815..e1a411c109 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@@ -24,7 +24,7 @@ public abstract class JobReport implements Serializable {private transient PatternSet patternSet;@Editable(order=100, description="Specify files relative to OneDev workspace. Use * or ? for pattern match. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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)@NotEmptydiff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.javaindex ff72d00b5e..d31c059d0b 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java@@ -31,7 +31,7 @@ public class JobService implements Serializable {private String memoryRequirement = "128m";@Editable(order=100, description="Specify name of the service, which will be used as host name to access "- + "the service. <b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "the service. <b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@DnsName(interpolative = true)@NotEmpty@@ -44,7 +44,7 @@ public class JobService implements Serializable {}@Editable(order=200, description="Specify docker image of the service. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")@NotEmptypublic String getImage() {@@ -56,7 +56,7 @@ public class JobService implements Serializable {}@Editable(order=220, description="Optionally specify arguments to run above image. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")public String getArguments() {return arguments;@@ -79,7 +79,7 @@ public class JobService implements Serializable {@Editable(order=400, description="Specify command to check readiness of the service. This command will "+ "be interpretated by cmd.exe on Windows images, and by shell on Linux images. It will be "+ "executed repeatedly until a zero code is returned to indicate service ready. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")@NotEmptypublic String getReadinessCheckCommand() {@@ -92,7 +92,7 @@ public class JobService implements Serializable {@Editable(order=10000, name="CPU Requirement", group="More Settings", description="Specify CPU requirement of the job. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")@NotEmptypublic String getCpuRequirement() {@@ -105,7 +105,7 @@ public class JobService implements Serializable {@Editable(order=10100, group="More Settings", description="Specify memory requirement of the job. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")@NotEmptypublic String getMemoryRequirement() {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 9d65b5ff78..cbd3478808 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@@ -68,7 +68,7 @@ public class ProjectDependency implements Serializable {}@Editable(order=300, name="Build", description="Specify build to retrieve artifacts from. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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", literalSuggester="suggestBuilds")@NotEmptypublic String getBuildNumber() {@@ -100,7 +100,7 @@ public class ProjectDependency implements Serializable {}@Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve into job workspace. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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)@NotEmptydiff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.javaindex 3a419d594f..68908139d9 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java@@ -46,7 +46,7 @@ public class CreateIssueAction extends PostBuildAction {private List<FieldSupply> issueFields = new ArrayList<>();@Editable(order=1000, name="Title", group="Issue Detail", description="Specify title of the issue. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")@NotEmptypublic String getIssueTitle() {@@ -58,7 +58,7 @@ public class CreateIssueAction extends PostBuildAction {}@Editable(order=1050, name="Description", group="Issue Detail", description="Optionally specify description of the issue. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Multiline@Interpolative(variableSuggester="suggestVariables")public String getIssueDescription() {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 e5f3ba18ed..dfb240f278 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@@ -33,11 +33,9 @@ public class GroovyScript implements Serializable {private String name;- private String description;-private List<String> content;- private boolean canBeUsedByJobs = true;+ private boolean canBeUsedByBuildJobs = true;private String allowedProjects;@@ -54,15 +52,6 @@ public class GroovyScript implements Serializable {this.name = name;}- @Editable(order=200)- public String getDescription() {- return description;- }-- public void setDescription(String description) {- this.description = description;- }-@Editable(order=300)@Code(language = Code.GROOVY)@Size(min=1, message="May not be empty")@@ -75,23 +64,23 @@ public class GroovyScript implements Serializable {}@Editable(order=350)- public boolean isCanBeUsedByJobs() {- return canBeUsedByJobs;+ public boolean isCanBeUsedByBuildJobs() {+ return canBeUsedByBuildJobs;}- public void setCanBeUsedByJobs(boolean canBeUsedByJobs) {- this.canBeUsedByJobs = canBeUsedByJobs;+ public void setCanBeUsedByBuildJobs(boolean canBeUsedByBuildJobs) {+ this.canBeUsedByBuildJobs = canBeUsedByBuildJobs;}@SuppressWarnings("unused")- private static boolean isCanBeUsedByJobsEnabled() {- return (boolean) EditContext.get().getInputValue("canBeUsedByJobs");+ private static boolean isCanBeUsedByBuildJobsEnabled() {+ return (boolean) EditContext.get().getInputValue("canBeUsedByBuildJobs");}@Editable(order=400, description="Optionally specify space-separated projects allowed to "+ "execute this script. Use * or ? for wildcard match. Leave empty to allow all")@Patterns(suggester = "suggestProjects")- @ShowCondition("isCanBeUsedByJobsEnabled")+ @ShowCondition("isCanBeUsedByBuildJobsEnabled")@NameOfEmptyValue("All")public String getAllowedProjects() {return allowedProjects;@@ -104,7 +93,7 @@ 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- @ShowCondition("isCanBeUsedByJobsEnabled")+ @ShowCondition("isCanBeUsedByBuildJobsEnabled")@NameOfEmptyValue("All")public String getAllowedBranches() {return allowedBranches;@@ -122,7 +111,7 @@ public class GroovyScript implements Serializable {public final boolean isAuthorized(ScriptIdentity identity) {if (identity instanceof SiteAdministrator) {return true;- } else if (isCanBeUsedByJobs() && identity instanceof JobIdentity) {+ } else if (isCanBeUsedByBuildJobs() && identity instanceof JobIdentity) {JobIdentity jobIdentity = (JobIdentity) identity;Matcher matcher = new PathMatcher();return (getAllowedProjects() == null || PatternSet.fromString(getAllowedProjects()).matches(matcher, jobIdentity.getProject().getName()))diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.javaindex c198d087f2..465d41d8f2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java@@ -21,7 +21,7 @@ public class AutoDiscoveredJobExecutor extends JobExecutor {@Overridepublic void execute(String jobToken, JobContext context) {- context.getLogger().log("Discovering appropriate job executor...");+ context.getLogger().log("Discovering job executor...");List<JobExecutor> jobExecutors = new ArrayList<>();for (JobExecutorDiscoverer discoverer: OneDev.getExtensions(JobExecutorDiscoverer.class)) {JobExecutor jobExecutor = discoverer.discover();diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.jsindex 48565b2506..868371b9bd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js@@ -338,7 +338,7 @@ onedev.server.textDiff = {function showInvalidSelection() {var $content = $("<div></div>");$content.append("<a class='invalid'><i class='fa fa-warning'></i> Invalid selection, click for details</a>");- $content.children("a").attr("href", doclink + "/Diff-Selection");+ $content.children("a").attr("href", doclink + "/pages/diff-selection.md").attr("target", "_blank");return {position: position,content: $contentdiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.javaindex 18d845d691..bc8f96465b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java@@ -105,26 +105,7 @@ public class GroovyScriptListPage extends AdministrationPage {}});- columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Description")) {-- @Override- public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(LoopItem.class).getIndex()) {-- @Override- protected Component newLabel(String componentId) {- String description = rowModel.getObject().getDescription();- if (description != null)- return new Label(componentId, description);- else- return new Label(componentId, "<i>No description</i>").setEscapeModelStrings(false);- }-- });- }- });-- columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Can be Used by Jobs")) {+ columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Can be Used by Build Jobs")) {@Overridepublic void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {@@ -133,7 +114,7 @@ public class GroovyScriptListPage extends AdministrationPage {@Overrideprotected Component newLabel(String componentId) {- return new Label(componentId, TextUtils.describe(script.isCanBeUsedByJobs()));+ return new Label(componentId, TextUtils.describe(script.isCanBeUsedByBuildJobs()));}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 51f2f6f115..111ad4a4a8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -46,8 +46,8 @@<ul class="dropdown-menu"><li wicket:id="productVersion" class="dropdown-header"></li><li role="separator" class="divider"></li>- <li><a wicket:id="docLink">Documentation</a></li>- <li><a href="https://github.com/theonedev/onedev/issues">Support & Bug Report</a></li>+ <li><a wicket:id="docLink" target="_blank">Documentation</a></li>+ <li><a href="https://github.com/theonedev/onedev/issues" target="_blank">Support & Bug Report</a></li></ul></li><wicket:container wicket:id="notSignedIn">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.htmlindex 1a8fdb7239..d5ee236cc9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="changes"><div wicket:id="commits"></div>- <div class="help-block"><i class="fa fa-info-circle"></i> This page lists changes since previous build on <a href="https://github.com/theonedev/onedev/wiki/Build-Stream">same stream</a></div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists changes since previous build on <a href="https://code.onedev.io/projects/onedev-manual/blob/master/pages/build-stream.md" target="_blank">same stream</a></div></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.htmlindex 853486c8e9..30bcc47493 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="issues"><div wicket:id="issues"></div>- <div class="help-block"><i class="fa fa-info-circle"></i> This page lists fixed issues since previous build on <a href="https://github.com/theonedev/onedev/wiki/Build-Stream">same stream</a></div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists fixed issues since previous build on <a href="https://code.onedev.io/projects/onedev-manual/blob/master/pages/build-stream.md" target="_blank">same stream</a></div></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.htmlindex 2f33134a46..bf9e2a2811 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html@@ -1,7 +1,7 @@<wicket:extend><div class="page-title">Branch Protection</div><div class="help-block">- Define branch protection rules+ Define branch protection rules</div><div wicket:id="branchProtectionSetting" class="panel-list"><ul class="list-unstyled protections">diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.javaindex 5fe9168905..e9f503bfe0 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java@@ -32,7 +32,7 @@ public class JobHtmlReport extends JobReport {private String startPage;@Editable(order=1000, description="Specify report name. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")@PathSegment@NotEmpty@@ -45,7 +45,7 @@ public class JobHtmlReport extends JobReport {}@Editable(order=1100, description="Specify start page of the report relative to job workspace, for instance: api/index.html. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/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")@NotEmptypublic String getStartPage() {