The Unified and Autonomous Development Platform
fix: Exception when cleaup outdated caches (OD-2743)
Robin Shen72cccd2bda8b
diff --git a/server-core/src/main/java/io/onedev/server/ai/QueryDescriptions.java b/server-core/src/main/java/io/onedev/server/ai/QueryDescriptions.javaindex f171994970..e8307f696b 100644--- a/server-core/src/main/java/io/onedev/server/ai/QueryDescriptions.java+++ b/server-core/src/main/java/io/onedev/server/ai/QueryDescriptions.java@@ -504,7 +504,6 @@ public class QueryDescriptions {| '"Spec"' 'is' ('not')? '"'WorkspaceSpecName'"'| '"Create Date"' 'is' ('until'|'since') '"'DateDescription'"'| '"Active Date"' 'is' ('until'|'since') '"'DateDescription'"'- | '"Error Date"' 'is' ('until'|'since') '"'DateDescription'"'| criteria 'and' criteria| criteria 'or' criteria| 'not('criteria')'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 052c0e8baf..3a8987f837 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@@ -48,7 +48,6 @@ import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.buildspec.step.Step;import io.onedev.server.event.project.ProjectEvent;import io.onedev.server.git.GitUtils;-import io.onedev.server.job.match.JobMatch;import io.onedev.server.job.match.JobMatchContext;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;@@ -175,14 +174,8 @@ public class Job implements NamedElement, Validatable {branch = "main";JobMatchContext context = new JobMatchContext(page.getProject(), branch, null, jobName);for (JobExecutor executor: OneDev.getInstance(SettingService.class).getJobExecutors()) {- if (executor.isEnabled()) {- if (executor.getJobMatch() == null) {- applicableJobExecutors.add(executor.getName());- } else {- if (JobMatch.parse(executor.getJobMatch(), true, true).matches(context))- applicableJobExecutors.add(executor.getName());- }- }+ if (executor.isEnabled() && executor.isApplicable(context))+ applicableJobExecutors.add(executor.getName());}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PowerShellInterpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PowerShellInterpreter.javaindex ccd86a9c48..917cb0b32c 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PowerShellInterpreter.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PowerShellInterpreter.java@@ -15,7 +15,7 @@ public class PowerShellInterpreter extends Interpreter {private String powershell = "powershell.exe";- @Editable(order=100, name="Executable", description="Specify powershell executable to be used")+ @Editable(order=100, name="PowerShell Executable", description="Specify powershell executable to be used")@Interpolative(variableSuggester = "suggestVariables")@NotEmptypublic String getPowershell() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/ShellInterpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/ShellInterpreter.javaindex 9c14802bee..c09062e101 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/ShellInterpreter.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/ShellInterpreter.java@@ -15,7 +15,7 @@ public class ShellInterpreter extends Interpreter {private String shell = "bash";- @Editable(order=100, name="Shell", description="Specify shell to be used")+ @Editable(order=100, name="Shell Executable", description="Specify shell executable to be used")@Interpolative(variableSuggester = "suggestVariables")@NotEmptypublic String getShell() {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 730804309c..fd9ac24018 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@@ -8608,4 +8608,40 @@ public class DataMigrator {}}+ private void migrate223(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()) {+ String key = element.elementTextTrim("key");+ if (key.equals("JOB_EXECUTORS")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ for (Element executorElement : valueElement.elements()) {+ if (executorElement.getName().contains("ServerShellExecutor")+ || executorElement.getName().contains("RemoteShellExecutor")) {+ Element jobMatchElement = executorElement.element("jobMatch");+ if (jobMatchElement == null)+ executorElement.addElement("jobMatch").setText("\"Project\" is \"**\"");+ }+ }+ }+ } else if (key.equals("WORKSPACE_PROVISIONERS")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ for (Element provisionerElement : valueElement.elements()) {+ if (provisionerElement.getName().contains("ShellProvisioner")) {+ Element applicableProjectsElement = provisionerElement.element("applicableProjects");+ if (applicableProjectsElement == null)+ provisionerElement.addElement("applicableProjects").setText("**");+ }+ }+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.javaindex d440f3a4b5..981cb7e08c 100644--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java@@ -119,7 +119,6 @@ import io.onedev.server.exception.BadRequestException;import io.onedev.server.exception.ServerNotFoundException;import io.onedev.server.git.GitUtils;import io.onedev.server.git.service.GitService;-import io.onedev.server.job.match.JobMatch;import io.onedev.server.job.match.JobMatchContext;import io.onedev.server.logging.LogService;import io.onedev.server.logging.ServerLogger;@@ -505,28 +504,23 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthorizif (!step.isApplicable(build, executor))return false;}- if (executor.getJobMatch() != null) {- JobMatch jobMatch = JobMatch.parse(executor.getJobMatch(), true, true);- PullRequest request = build.getRequest();- if (request != null) {- if (request.getSource() != null) {- JobMatchContext sourceContext = new JobMatchContext(- request.getSourceProject(), request.getSourceBranch(),- null, build.getJobName());- JobMatchContext targetContext = new JobMatchContext(- request.getTargetProject(), request.getTargetBranch(),- null, build.getJobName());- return jobMatch.matches(sourceContext) && jobMatch.matches(targetContext);- } else {- return false;- }+ PullRequest request = build.getRequest();+ if (request != null) {+ if (request.getSource() != null) {+ JobMatchContext sourceContext = new JobMatchContext(+ request.getSourceProject(), request.getSourceBranch(),+ null, build.getJobName());+ JobMatchContext targetContext = new JobMatchContext(+ request.getTargetProject(), request.getTargetBranch(),+ null, build.getJobName());+ return executor.isApplicable(sourceContext) && executor.isApplicable(targetContext);} else {- return jobMatch.matches(new JobMatchContext(- build.getProject(), null, build.getCommitId(),- build.getJobName()));+ return false;}} else {- return true;+ return executor.isApplicable(new JobMatchContext(+ build.getProject(), null, build.getCommitId(),+ build.getJobName()));}}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 b7a92309f6..c6b5921b5d 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@@ -15,6 +15,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.JobMatch;import io.onedev.server.annotation.Patterns;import io.onedev.server.job.JobAuthorizationContext;+import io.onedev.server.model.Project;import io.onedev.server.model.Workspace;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.util.SuggestionUtils;@@ -123,6 +124,8 @@ public class GroovyScript implements Serializable {Usage usage = new Usage();if (jobAuthorization != null && io.onedev.server.job.match.JobMatch.parse(jobAuthorization, true, false).isUsingProject(projectPath))usage.add("authorization");+ if (Project.containsPath(applicableWorkspaceProjects, projectPath))+ usage.add("applicable workspace projects");return usage;}@@ -132,6 +135,7 @@ public class GroovyScript implements Serializable {jobMatch.onMoveProject(oldPath, newPath);jobAuthorization = jobMatch.toString();}+ applicableWorkspaceProjects = Project.substitutePath(applicableWorkspaceProjects, oldPath, newPath);}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javaindex 6805445815..87b9261ddd 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java@@ -20,6 +20,7 @@ import io.onedev.server.event.project.build.BuildRunning;import io.onedev.server.exception.ExceptionUtils;import io.onedev.server.job.JobContext;import io.onedev.server.job.match.JobMatch;+import io.onedev.server.job.match.JobMatchContext;import io.onedev.server.model.Build;import io.onedev.server.persistence.TransactionService;import io.onedev.server.service.AgentService;@@ -37,11 +38,11 @@ public abstract class JobExecutor implements Serializable {private String name;- private String jobMatch;-private boolean htmlReportPublishEnabled;private boolean sitePublishEnabled;++ protected String jobMatch;public boolean isEnabled() {return enabled;@@ -87,27 +88,17 @@ public abstract class JobExecutor implements Serializable {return WicketUtils.isSubscriptionActive();}- @Editable(order=10000, name="Applicable Jobs", placeholder="Any job", description="Optionally specify applicable jobs of this executor")- @io.onedev.server.annotation.JobMatch(withProjectCriteria = true, withJobCriteria = true)- @Nullable- public String getJobMatch() {- return jobMatch;- }-- public void setJobMatch(String jobMatch) {- this.jobMatch = jobMatch;- }-public abstract boolean execute(JobContext jobContext, TaskLogger jobLogger);+ public abstract boolean isApplicable(JobMatchContext context);+public Usage onDeleteProject(String projectPath) {Usage usage = new Usage();- if (jobMatch != null && JobMatch.parse(jobMatch, true, true).isUsingProject(projectPath)) {- usage.add("applicable jobs" );- }+ if (jobMatch != null && JobMatch.parse(jobMatch, true, true).isUsingProject(projectPath))+ usage.add("applicable jobs");return usage;}-+public void onMoveProject(String oldPath, String newPath) {if (jobMatch != null) {JobMatch parsedJobMatch = JobMatch.parse(jobMatch, true, true);@@ -115,7 +106,7 @@ public abstract class JobExecutor implements Serializable {jobMatch = parsedJobMatch.toString();}}-+protected void notifyJobRunning(Long buildId, @Nullable Long agentId) {OneDev.getInstance(TransactionService.class).run(() -> {BuildService buildService = OneDev.getInstance(BuildService.class);diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java b/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.javaindex 8470bb6fa8..d6cb6082f5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java@@ -10,7 +10,6 @@ import static java.util.stream.Collectors.toMap;import java.io.File;import java.io.Serializable;import java.util.ArrayList;-import java.util.List;import java.util.Map;import java.util.concurrent.atomic.AtomicBoolean;@@ -19,7 +18,6 @@ import javax.validation.constraints.NotEmpty;import io.onedev.agent.AgentUtils;import io.onedev.commons.bootstrap.Bootstrap;-import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.loader.ExtensionPoint;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.TaskLogger;@@ -27,16 +25,16 @@ import io.onedev.commons.utils.command.LineConsumer;import io.onedev.server.OneDev;import io.onedev.server.annotation.DnsName;import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Patterns;import io.onedev.server.cluster.ClusterService;import io.onedev.server.git.CommandUtils;import io.onedev.server.git.GitUtils;import io.onedev.server.git.hook.HookUtils;import io.onedev.server.git.location.GitLocation;+import io.onedev.server.model.Project;import io.onedev.server.model.support.workspace.spec.EnvVar;import io.onedev.server.persistence.SessionService;import io.onedev.server.service.ProjectService;-import io.onedev.server.web.util.SuggestionUtils;+import io.onedev.server.util.usage.Usage;import io.onedev.server.workspace.WorkspaceContext;import io.onedev.server.workspace.WorkspaceRuntime;import io.onedev.server.workspace.WorkspaceService;@@ -52,6 +50,8 @@ public abstract class WorkspaceProvisioner implements Serializable {private String name;private Integer concurrency;++ protected String applicableProjects;@Editable(order=1000, placeholder="CPU cores", description = """Specify max number of workspaces this provisioner can handle concurrently.@@ -65,8 +65,6 @@ public abstract class WorkspaceProvisioner implements Serializable {this.concurrency = concurrency;}- private String applicableProjects;-public boolean isEnabled() {return enabled;}@@ -86,23 +84,6 @@ public abstract class WorkspaceProvisioner implements Serializable {this.name = name;}- @Editable(order=10000, placeholder="Any project", description="Optionally specify projects applicable for this provisioner. " +- "Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. " +- "Multiple projects should be separated by space")- @Patterns(suggester="suggestProjects", path=true)- public String getApplicableProjects() {- return applicableProjects;- }-- public void setApplicableProjects(String applicableProjects) {- this.applicableProjects = applicableProjects;- }-- @SuppressWarnings("unused")- private static List<InputSuggestion> suggestProjects(String matchWith) {- return SuggestionUtils.suggestProjectPaths(matchWith);- }-protected ClusterService getClusterService() {return OneDev.getInstance(ClusterService.class);}@@ -215,6 +196,19 @@ public abstract class WorkspaceProvisioner implements Serializable {return envVars;}+ public abstract boolean isApplicable(Project project);+public abstract WorkspaceRuntime provision(WorkspaceContext context, TaskLogger logger);+ public void onMoveProject(String oldPath, String newPath) {+ applicableProjects = Project.substitutePath(applicableProjects, oldPath, newPath);+ }++ public Usage onDeleteProject(String projectPath) {+ Usage usage = new Usage();+ if (Project.containsPath(applicableProjects, projectPath))+ usage.add("applicable projects");+ return usage;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.javaindex e569f3090e..3233c40f17 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java@@ -126,7 +126,7 @@ public class WorkspaceSpec implements Serializable, Validatable {private static List<InputSuggestion> suggestProvisioners(String matchWith) {List<String> provisionerNames = new ArrayList<>();for (WorkspaceProvisioner provisioner: OneDev.getInstance(SettingService.class).getWorkspaceProvisioners()) {- if (provisioner.isEnabled())+ if (provisioner.isEnabled() && provisioner.isApplicable(Project.get()))provisionerNames.add(provisioner.getName());}return SuggestionUtils.suggest(provisionerNames, matchWith);@@ -182,6 +182,18 @@ public class WorkspaceSpec implements Serializable, Validatable {this.userDatas = userDatas;}+ @Editable(order = 375, name="Exposed Ports", placeholder = "No exposed ports", description = """+ Optionally specify container ports to expose. These ports will be mapped to random ports on host+ which will be displayed on the workspace page""")+ @DependsOn(property = "runInContainer")+ public List<Integer> getContainerPorts() {+ return containerPorts;+ }++ public void setContainerPorts(List<Integer> containerPorts) {+ this.containerPorts = containerPorts;+ }+@Editable(order = 400, name = "Environment Variables", description = "Optionally specify environment variables")@Validpublic List<EnvVar> getEnvVars() {@@ -264,18 +276,6 @@ public class WorkspaceSpec implements Serializable, Validatable {this.cacheConfigs = cacheConfigs;}- @Editable(order = 1700, group = "More Settings", name="Exposed Ports", placeholder = "No exposed ports", description = """- Optionally specify container ports to expose. These ports will be mapped to random ports on host- which will be displayed on the workspace page""")- @DependsOn(property = "runInContainer")- public List<Integer> getContainerPorts() {- return containerPorts;- }-- public void setContainerPorts(List<Integer> containerPorts) {- this.containerPorts = containerPorts;- }-@Overridepublic boolean isValid(ConstraintValidatorContext context) {boolean isValid = true;diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/CustomLinuxShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/CustomLinuxShell.javaindex 9cf7f3de18..b6e17f43db 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/CustomLinuxShell.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/CustomLinuxShell.java@@ -15,7 +15,7 @@ public class CustomLinuxShell extends WorkspaceShell {private String shell = "bash";- @Editable(order=100, description="Specify shell executable to be used")+ @Editable(order=100, name="Shell Executable", description="Specify shell executable to be used")@Interpolative(variableSuggester = "suggestVariables")@NotEmptypublic String getShell() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PowerShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PowerShell.javaindex 6b8c5e69ce..95e38b9d67 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PowerShell.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PowerShell.java@@ -15,7 +15,7 @@ public class PowerShell extends WorkspaceShell {private String powershell = "powershell.exe";- @Editable(order=100, description="Specify powershell executable to be used")+ @Editable(order=100, name="PowerShell Executable", description="Specify powershell executable to be used")@Interpolative(variableSuggester = "suggestVariables")@NotEmptypublic String getPowershell() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.javaindex 4260d45bc6..670391f2de 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java@@ -22,7 +22,7 @@ public class ClaudeCodeInContainer extends WorkspaceSpecTemplate {workspaceSpec.setName(getName());workspaceSpec.setRunInContainer(true);- workspaceSpec.setImage("1dev/claudecode:1.0.0");+ workspaceSpec.setImage("1dev/claudecode");workspaceSpec.setShell(new CustomLinuxShell());workspaceSpec.setRunAs("1001:1001");diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.javaindex d30f1455de..a1383a2c62 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java@@ -22,7 +22,7 @@ public class CodexInContainer extends WorkspaceSpecTemplate {workspaceSpec.setName(getName());workspaceSpec.setRunInContainer(true);- workspaceSpec.setImage("1dev/codex:1.0.0");+ workspaceSpec.setImage("1dev/codex");workspaceSpec.setShell(new CustomLinuxShell());workspaceSpec.setRunAs("1001:1001");diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.javaindex 2e11f6de33..84a7978834 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java@@ -22,7 +22,7 @@ public class OpenCodeInContainer extends WorkspaceSpecTemplate {workspaceSpec.setName(getName());workspaceSpec.setRunInContainer(true);- workspaceSpec.setImage("1dev/opencode:1.0.0");+ workspaceSpec.setImage("1dev/opencode");workspaceSpec.setRunAs("1001:1001");workspaceSpec.setShell(new CustomLinuxShell());diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultRunCacheService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultRunCacheService.javaindex 640d78db99..f5c7037b64 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultRunCacheService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultRunCacheService.java@@ -37,15 +37,16 @@ import io.onedev.k8shelper.CacheAvailability;import io.onedev.server.event.Listen;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;+import io.onedev.server.persistence.SessionService;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.service.ProjectService;import io.onedev.server.service.RunCacheService;import io.onedev.server.service.support.CacheFindResult;import io.onedev.server.service.support.RunCacheInfo;-import io.onedev.server.util.PathIndexUtils;import io.onedev.server.taskschedule.SchedulableTask;import io.onedev.server.taskschedule.TaskScheduler;import io.onedev.server.util.IOUtils;+import io.onedev.server.util.PathIndexUtils;import io.onedev.server.util.concurrent.BatchWorkExecutionService;import io.onedev.server.util.concurrent.BatchWorker;import io.onedev.server.util.concurrent.Prioritized;@@ -67,6 +68,9 @@ public class DefaultRunCacheService implements RunCacheService, Serializable, Sc@Injectprivate TaskScheduler taskScheduler;+ @Inject+ private SessionService sessionService;+@Injectprivate BatchWorkExecutionService batchWorkExecutionService;@@ -342,7 +346,9 @@ public class DefaultRunCacheService implements RunCacheService, Serializable, Scvar now = new DateTime();for (var projectId: projectService.getActiveIds()) {try {- var preserveDays = projectService.load(projectId).getHierarchyCachePreserveDays();+ var preserveDays = sessionService.call(() -> {+ return projectService.load(projectId).getHierarchyCachePreserveDays();+ });var thresholdMillis = now.minusDays(preserveDays).getMillis();var cacheDirs = projectService.getCacheDir(projectId);var children = cacheDirs.listFiles();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.javaindex b453f58ae7..623178f683 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java@@ -529,6 +529,8 @@ public class DefaultSettingService extends BaseEntityService<Setting> implementspublic void onMoveProject(String oldPath, String newPath) {for (JobExecutor jobExecutor: getJobExecutors())jobExecutor.onMoveProject(oldPath, newPath);+ for (WorkspaceProvisioner workspaceProvisioner: getWorkspaceProvisioners())+ workspaceProvisioner.onMoveProject(oldPath, newPath);for (GroovyScript groovyScript: getGroovyScripts())groovyScript.onMoveProject(oldPath, newPath);if (getServiceDeskSetting() != null)@@ -536,6 +538,7 @@ public class DefaultSettingService extends BaseEntityService<Setting> implementsgetIssueSetting().onMoveProject(oldPath, newPath);saveSetting(Key.JOB_EXECUTORS, (Serializable) getJobExecutors());+ saveSetting(Key.WORKSPACE_PROVISIONERS, (Serializable) getWorkspaceProvisioners());saveSetting(Key.GROOVY_SCRIPTS, (Serializable) getGroovyScripts());saveSetting(Key.SERVICE_DESK_SETTING, getServiceDeskSetting());saveSetting(Key.ISSUE, getIssueSetting());@@ -547,6 +550,8 @@ public class DefaultSettingService extends BaseEntityService<Setting> implementsfor (JobExecutor jobExecutor: getJobExecutors())usage.add(jobExecutor.onDeleteProject(projectPath).prefix("job executor '" + jobExecutor.getName() + "'"));+ for (WorkspaceProvisioner workspaceProvisioner: getWorkspaceProvisioners())+ usage.add(workspaceProvisioner.onDeleteProject(projectPath).prefix("workspace provisioner '" + workspaceProvisioner.getName() + "'"));for (GroovyScript groovyScript: getGroovyScripts())usage.add(groovyScript.onDeleteProject(projectPath).prefix("groovy script '" + groovyScript.getName() + "'"));if (getServiceDeskSetting() != null)diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.javaindex 1806f5979f..9b057cc087 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java@@ -171,21 +171,21 @@ public class AgentQueryBehavior extends ANTLRAssistBehavior {protected List<String> getHints(TerminalExpect terminalExpect) {List<String> hints = new ArrayList<>();if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if ("criteriaValue".equals(spec.getLabel()) && AgentQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");+ if (criteriaValueExpect != null && AgentQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = AgentQuery.getValue(fieldElements.get(0).getMatchedText());if (fieldName.equals(Agent.NAME_NAME)- || fieldName.equals(Agent.NAME_OS_NAME)- || fieldName.equals(Agent.NAME_OS_ARCH)+ || fieldName.equals(Agent.NAME_OS_NAME)+ || fieldName.equals(Agent.NAME_OS_ARCH)|| fieldName.equals(Agent.NAME_OS_VERSION)|| fieldName.equals(Agent.NAME_IP_ADDRESS)) {hints.add(_T("Use '*' for wildcard match"));}}}- }+ }if (getSettingService().getAiSetting().getLiteModelSetting() == null)hints.add(_T("<a href='/~administration/settings/lite-ai-model' target='_blank'>Set up AI</a> to query with natural language</a>"));return hints;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.javaindex 3e4622e5a1..05b31c95ed 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java@@ -145,9 +145,9 @@ public class BuildMetricQueryBehavior extends ANTLRAssistBehavior {protected List<String> getHints(TerminalExpect terminalExpect) {List<String> hints = new ArrayList<>();if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if ("criteriaValue".equals(spec.getLabel()) && EntityQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");+ if (criteriaValueExpect != null && EntityQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = EntityQuery.getValue(fieldElements.get(0).getMatchedText());if (fieldName.equals(Build.NAME_PROJECT) || fieldName.equals(Build.NAME_VERSION)diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex a51077b330..4a44cc12fa 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -240,9 +240,9 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {protected List<String> getHints(TerminalExpect terminalExpect) {List<String> hints = new ArrayList<>();if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");+ if (criteriaValueExpect != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());if (fieldName.equals(Build.NAME_PROJECT)) {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.javaindex 8c83297af9..b3fbe2da01 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java@@ -156,9 +156,9 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {protected List<String> getHints(TerminalExpect terminalExpect) {List<String> hints = new ArrayList<>();if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if ("criteriaValue".equals(spec.getLabel()) && ProjectQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");+ if (criteriaValueExpect != null && ProjectQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());if (fieldName.equals(CodeComment.NAME_CONTENT)) {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 92dd018a2a..2ecf5bcc99 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -397,9 +397,9 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {List<String> hints = new ArrayList<>();GlobalIssueSetting issueSetting = getSettingService().getIssueSetting();if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");+ if (criteriaValueExpect != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());var fieldSpec = issueSetting.getFieldSpec(fieldName);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.javaindex ad55491df3..c71f18078e 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java@@ -1,8 +1,21 @@package io.onedev.server.web.behavior;+import static io.onedev.commons.codeassist.AntlrUtils.getLexerRule;+import static io.onedev.commons.codeassist.AntlrUtils.getLexerRuleName;+import static io.onedev.server.job.match.JobMatchLexer.Is;+import static io.onedev.server.job.match.JobMatchLexer.IsNot;+import static io.onedev.server.job.match.JobMatchLexer.OnBranch;+import static io.onedev.server.job.match.JobMatchLexer.ruleNames;+import static io.onedev.server.web.translation.Translation._T;++import java.util.ArrayList;+import java.util.List;++import org.apache.commons.lang3.StringUtils;+import com.google.common.base.Optional;import com.google.common.base.Preconditions;-import io.onedev.commons.codeassist.AntlrUtils;+import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;@@ -14,17 +27,8 @@ import io.onedev.server.job.match.JobMatch;import io.onedev.server.job.match.JobMatchParser;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;-import org.apache.commons.lang3.StringUtils;--import java.util.ArrayList;-import java.util.List;--import static io.onedev.commons.codeassist.AntlrUtils.getLexerRule;-import static io.onedev.commons.codeassist.AntlrUtils.getLexerRuleName;-import static io.onedev.server.job.match.JobMatchLexer.*;public class JobMatchBehavior extends ANTLRAssistBehavior {@@ -80,7 +84,7 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {@Overrideprotected String getFencingDescription() {- return "value should be quoted";+ return _T("value should be quoted");}}.suggest(terminalExpect);@@ -92,9 +96,9 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {if (suggestedLiteral.equals(getLexerRuleName(ruleNames, OnBranch)))- return Optional.of("branch the build commit is merged into");+ return Optional.of(_T("branch the build commit is merged into"));else if (suggestedLiteral.equals(","))- return Optional.of("or match another value");+ return Optional.of(_T("or match another value"));parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {@@ -115,22 +119,22 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {protected List<String> getHints(TerminalExpect terminalExpect) {List<String> hints = new ArrayList<>();if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");+ if (criteriaValueExpect != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {- String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());+ String fieldName = JobMatch.getValue(fieldElements.get(0).getMatchedText());if (fieldName.equals(Build.NAME_PROJECT))- hints.add("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>");+ hints.add(_T("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>"));else if (fieldName.equals(Build.NAME_JOB))- hints.add("Use '*' or '?' for wildcard match");+ hints.add(_T("Use '*' or '?' for wildcard match"));} else {- List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);+ List<Element> operatorElements = criteriaValueExpect.getState().findMatchedElementsByLabel("operator", true);Preconditions.checkState(operatorElements.size() == 1);String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());- int operator = AntlrUtils.getLexerRule(ruleNames, operatorName);+ int operator = getLexerRule(ruleNames, operatorName);if (operator == OnBranch)- hints.add("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>");+ hints.add(_T("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>"));}}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.javaindex d6fc382f02..992a961828 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java@@ -205,10 +205,10 @@ public class PackQueryBehavior extends ANTLRAssistBehavior {protected List<String> getHints(TerminalExpect terminalExpect) {List<String> hints = new ArrayList<>();if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);- List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);+ ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");+ if (criteriaValueExpect != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ List<Element> operatorElements = criteriaValueExpect.getState().findMatchedElementsByLabel("operator", true);if (!fieldElements.isEmpty()) {String fieldName = PackQuery.getValue(fieldElements.get(0).getMatchedText());if (fieldName.equals(Pack.NAME_PROJECT)) {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.javaindex 2a14ebe781..506acc6354 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java@@ -199,9 +199,9 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {protected List<String> getHints(TerminalExpect terminalExpect) {List<String> hints = new ArrayList<>();if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");+ if (criteriaValueExpect != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());if (fieldName.equals(Project.NAME_NAME)@@ -215,7 +215,7 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {hints.add(_T("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>"));}} else {- Element operatorElement = terminalExpect.getState()+ Element operatorElement = criteriaValueExpect.getState().findMatchedElementsByLabel("operator", true).iterator().next();int type = operatorElement.getMatchedTokens().iterator().next().getType();if (type == ProjectQueryLexer.ForksOf || type == ProjectQueryLexer.ChildrenOf)diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex e62241b014..95de946ee1 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -242,9 +242,9 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {protected List<String> getHints(TerminalExpect terminalExpect) {List<String> hints = new ArrayList<>();if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if ("criteriaValue".equals(spec.getLabel()) && ProjectQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");+ if (criteriaValueExpect != null && ProjectQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());if (fieldName.equals(PullRequest.NAME_TARGET_PROJECT)diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/WorkspaceQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/WorkspaceQueryBehavior.javaindex a86b09867e..37dccf2268 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/WorkspaceQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/WorkspaceQueryBehavior.java@@ -192,9 +192,9 @@ public class WorkspaceQueryBehavior extends ANTLRAssistBehavior {protected List<String> getHints(TerminalExpect terminalExpect) {List<String> hints = new ArrayList<>();if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");+ if (criteriaValueExpect != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = WorkspaceQuery.getValue(fieldElements.get(0).getMatchedText());if (fieldName.equals(Workspace.NAME_PROJECT)) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.htmlindex 69c3d9650f..5732b5142c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <form wicket:id="form" class="bean-edit leave-confirm">+ <form wicket:id="form" class="bean-edit"><div class="modal-header"><h5 wicket:id="title" class="modal-title"></h5><button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.javaindex 67db41751f..3969067bba 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java@@ -41,8 +41,10 @@ abstract class BeanEditContentPanel extends Panel {super.onError();RequestCycle.get().find(AjaxRequestTarget.class).add(this);}-+};+ if (isLeaveConfirm())+ form.add(AttributeAppender.append("class", "leave-confirm"));form.setOutputMarkupId(true);if (getTitle() != null)@@ -132,4 +134,8 @@ abstract class BeanEditContentPanel extends Panel {return true;}+ protected boolean isLeaveConfirm() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.javaindex 3a940cd75f..994a6fd669 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java@@ -48,6 +48,11 @@ public abstract class BeanEditModalPanel<T extends Serializable> extends ModalPareturn BeanEditModalPanel.this.isDirtyAware();}+ @Override+ protected boolean isLeaveConfirm() {+ return BeanEditModalPanel.this.isLeaveConfirm();+ }+@Overrideprotected String onSave(AjaxRequestTarget target) {return BeanEditModalPanel.this.onSave(target, bean);@@ -86,6 +91,10 @@ public abstract class BeanEditModalPanel<T extends Serializable> extends ModalPareturn true;}+ protected boolean isLeaveConfirm() {+ return true;+ }+protected abstract String onSave(AjaxRequestTarget target, T bean);protected void onCancel(AjaxRequestTarget target) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecsPage.javaindex 99243442c9..827cc1b8bc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecsPage.java@@ -157,7 +157,7 @@ public class WorkspaceSpecsPage extends ProjectSettingPage {public void onClick(AjaxRequestTarget target) {new BeanEditModalPanel<WorkspaceSpecTemplateBean>(target, new WorkspaceSpecTemplateBean()) {- @Override+ @Overrideprotected String onSave(AjaxRequestTarget target, WorkspaceSpecTemplateBean bean) {var spec = bean.getTemplate().createWorkspaceSpec();for (WorkspaceSpec existing : getProject().getWorkspaceSpecs()) {@@ -172,7 +172,12 @@ public class WorkspaceSpecsPage extends ProjectSettingPage {target.add(container);return null;}-++ @Override+ protected boolean isLeaveConfirm() {+ return false;+ }+};}diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.javaindex 021b2fa9af..c14a84a256 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java@@ -1388,7 +1388,6 @@ public class Translation_de extends TranslationResourceBundle {m.put("Excluded", "Ausgeschlossen");m.put("Excluded Fields", "Ausgeschlossene Felder");m.put("Excluded Files for Review", "Ausgeschlossene Dateien zur Überprüfung");- m.put("Executable", "Ausführbar");m.put("Execute Commands", "Befehle ausführen");m.put("Execute Commands via SSH", "Befehle über SSH ausführen");m.put("Exit Impersonation", "Impersonation beenden");@@ -2884,6 +2883,8 @@ public class Translation_de extends TranslationResourceBundle {m.put("Permanent link of this selection", "Permanenter Link dieser Auswahl");m.put("Permission denied", "Zugriff verweigert");m.put("Permission will be checked upon actual operation", "Berechtigung wird bei der tatsächlichen Operation überprüft");+ m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",+ "Persönliche Arbeitsbereichsdaten werden hier gespeichert, nachdem ein Arbeitsbereich gelöscht wurde. Sie werden mit allen Arbeitsbereichen geteilt, die anschließend mit demselben Benutzerschlüssel und Pfad erstellt werden.");m.put("Physical memory in mega bytes", "Physischer Speicher in Megabyte");m.put("Pick Existing", "Vorhandenes auswählen");m.put("Pin this issue", "Dieses Problem anheften");@@ -2963,7 +2964,6 @@ public class Translation_de extends TranslationResourceBundle {m.put("Post URL", "Post-URL");m.put("Post Url", "Post-URL");m.put("PowerShell", "PowerShell");- m.put("Powershell", "Powershell");m.put("Prefix Pattern", "Präfix-Muster");m.put("Prefix the title with <code>WIP</code> or <code>[WIP]</code> to mark the pull request as work in progress","Präfixieren Sie den Titel mit <code>WIP</code> oder <code>[WIP]</code>, um die Pull-Anfrage als in Bearbeitung zu kennzeichnen");@@ -3921,7 +3921,6 @@ public class Translation_de extends TranslationResourceBundle {m.put("Specify shell commands to execute under the <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>job working directory</a>","Geben Sie Shell-Befehle an, die unter dem <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>Job-Arbeitsbereich</a> ausgeführt werden sollen.");m.put("Specify shell executable to be used", "Geben Sie das Shell-Executable an, das verwendet werden soll");- m.put("Specify shell to be used", "Geben Sie die zu verwendende Shell an.");m.put("Specify source param for SCP command, for instance <code>app.tar.gz</code>", "Geben Sie die Quellparameter für den SCP-Befehl an, beispielsweise <code>app.tar.gz</code>.");m.put("Specify space separated refs to pull from remote. '*' can be used in ref name for wildcard match<br><b class='text-danger'>NOTE:</b> branch/tag protection rule will be ignored when update branches/tags via this step","Geben Sie durch Leerzeichen getrennte Refs an, die vom Remote abgerufen werden sollen. '*' kann im Ref-Namen für Wildcard-Abgleich verwendet werden.<br><b class='text-danger'>HINWEIS:</b> Die Regel zum Schutz von Branches/Tags wird ignoriert, wenn Branches/Tags über diesen Schritt aktualisiert werden.");@@ -4201,10 +4200,6 @@ public class Translation_de extends TranslationResourceBundle {"Dieser Executor führt Build-Jobs als Docker-Container auf Remote-Maschinen über <a href='/~administration/agents' target='_blank'>Agents</a> aus");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","Dieser Executor führt Build-Jobs als Pods in einem Kubernetes-Cluster aus. Es werden keine Agents benötigt.<b class='text-danger'>Hinweis:</b> Stellen Sie sicher, dass die Server-URL in den Systemeinstellungen korrekt angegeben ist, da Job-Pods darauf zugreifen müssen, um Quellcode und Artefakte herunterzuladen");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",- "Dieser Executor führt Build-Jobs mit der Shell-Funktionalität des OneDev-Servers aus.<br><b class='text-danger'>WARNUNG</b>: Jobs, die mit diesem Executor ausgeführt werden, haben dieselben Berechtigungen wie der OneDev-Serverprozess. Stellen Sie sicher, dass er nur von vertrauenswürdigen Jobs verwendet werden kann");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",- "Dieser Executor führt Build-Jobs mit der Shell-Funktionalität von Remote-Maschinen über <a href='/~administration/agents' target='_blank'>Agents</a> aus.<br><b class='text-danger'>WARNUNG</b>: Jobs, die mit diesem Executor ausgeführt werden, haben dieselben Berechtigungen wie der OneDev-Agent-Prozess. Stellen Sie sicher, dass er nur von vertrauenswürdigen Jobs verwendet werden kann");m.put("This field is required", "Dieses Feld ist erforderlich");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","Dieser Filter wird verwendet, um den LDAP-Eintrag für den aktuellen Benutzer zu bestimmen. Zum Beispiel: <i>(&(uid={0})(objectclass=person))</i>. In diesem Beispiel repräsentiert <i>{0}</i> den Anmeldenamen des aktuellen Benutzers.");@@ -4264,8 +4259,6 @@ public class Translation_de extends TranslationResourceBundle {m.put("This property is imported from {0}", "Diese Eigenschaft wird aus {0} importiert");m.put("This provisioner creates workspaces inside Docker containers on the OneDev server for\nsecurity and isolation purpose. It is currently not supported when OneDev server is\ninstalled inside Kubernetes cluster","Dieser Provisioner erstellt Workspaces innerhalb von Docker-Containern auf dem OneDev-Server für\nSicherheits- und Isolationszwecke. Es wird derzeit nicht unterstützt, wenn der OneDev-Server\ninnerhalb eines Kubernetes-Clusters installiert ist");- m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have the same\npermission as the OneDev server process. Make sure it can only be used by trusted projects.\n",- "Dieser Provisioner erstellt Arbeitsbereiche mit der Shell-Funktion des OneDev-Servers und erfordert\ndass tmux auf dem OneDev-Server installiert ist<br>\n<b class='text-danger'>WARNUNG</b>: Arbeitsbereiche, die von diesem Provisioner erstellt werden, haben dieselben\nBerechtigungen wie der OneDev-Serverprozess. Stellen Sie sicher, dass er nur von vertrauenswürdigen Projekten verwendet werden kann.\n");m.put("This pull request has been discarded", "Dieser Pull-Request wurde verworfen");m.put("This report will be displayed in pull request overview page if build is triggered by pull request","Dieser Bericht wird auf der Übersichtsseite des Pull-Requests angezeigt, wenn der Build durch den Pull-Request ausgelöst wird");@@ -5031,8 +5024,18 @@ public class Translation_de extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",- "Persönliche Arbeitsbereichsdaten werden hier gespeichert, nachdem ein Arbeitsbereich gelöscht wurde. Sie werden mit allen Arbeitsbereichen geteilt, die anschließend mit demselben Benutzerschlüssel und Pfad erstellt werden.");+ m.put("PowerShell Executable", "PowerShell-Ausführbare Datei");+ m.put("Shell Executable", "Shell-Ausführbare Datei");+ m.put("Specify applicable jobs of this executor.\n<b class='text-danger'>WARNING</b>: Jobs running with this executor has same privilege as OneDev process.\nPlease make sure that only trusted jobs can use this executor",+ "Geben Sie die anwendbaren Jobs dieses Executors an.\n<b class='text-danger'>WARNUNG</b>: Jobs, die mit diesem Executor ausgeführt werden, haben dieselben Privilegien wie der OneDev-Prozess.\nBitte stellen Sie sicher, dass nur vertrauenswürdige Jobs diesen Executor verwenden können");+ m.put("This executor runs build jobs with OneDev server's shell facility", "Dieser Executor führt Build-Jobs mit der Shell-Funktionalität des OneDev-Servers aus");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a>",+ "Dieser Executor führt Build-Jobs mit der Shell-Funktionalität von Remote-Maschinen über <a href='/~administration/agents' target='_blank'>Agenten</a> aus");+ m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server",+ "Dieser Bereitsteller erstellt Arbeitsbereiche mit der Shell-Funktionalität des OneDev-Servers und erfordert\ndass tmux auf dem OneDev-Server installiert ist");+ m.put("Use '*' or '?' for wildcard match", "Verwenden Sie '*' oder '?' für Platzhalterabgleich");+ m.put("Workspaces created by this provisioner have same privilege as OneDev server process.\nUse '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>.\nMultiple projects should be separated by space.<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have same privilege as OneDev server process.\nPlease make sure that only trusted projects can use this provisioner",+ "Arbeitsbereiche, die von diesem Bereitsteller erstellt werden, haben dieselben Privilegien wie der OneDev-Server-Prozess.\nVerwenden Sie '**', '*' oder '?' für <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>Pfad-Platzhalterabgleich</a>.\nMehrere Projekte sollten durch Leerzeichen getrennt werden.<br>\n<b class='text-danger'>WARNUNG</b>: Arbeitsbereiche, die von diesem Bereitsteller erstellt werden, haben dieselben Privilegien wie der OneDev-Server-Prozess.\nBitte stellen Sie sicher, dass nur vertrauenswürdige Projekte diesen Bereitsteller verwenden können");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.javaindex 59503a4a1c..b6b63cb806 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java@@ -1388,7 +1388,6 @@ public class Translation_es extends TranslationResourceBundle {m.put("Excluded", "Excluido");m.put("Excluded Fields", "Campos Excluidos");m.put("Excluded Files for Review", "Archivos Excluidos para Revisión");- m.put("Executable", "Ejecutable");m.put("Execute Commands", "Ejecutar Comandos");m.put("Execute Commands via SSH", "Ejecutar Comandos vía SSH");m.put("Exit Impersonation", "Salir de la Suplantación");@@ -2884,6 +2883,8 @@ public class Translation_es extends TranslationResourceBundle {m.put("Permanent link of this selection", "Enlace permanente de esta selección");m.put("Permission denied", "Permiso denegado");m.put("Permission will be checked upon actual operation", "El permiso será verificado durante la operación real");+ m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",+ "Los datos del espacio de trabajo personal se guardarán aquí después de que se elimine un espacio de trabajo. Se compartirán con todos los espacios de trabajo creados posteriormente con la misma clave de usuario y ruta");m.put("Physical memory in mega bytes", "Memoria física en megabytes");m.put("Pick Existing", "Seleccionar existente");m.put("Pin this issue", "Anclar este problema");@@ -2963,7 +2964,6 @@ public class Translation_es extends TranslationResourceBundle {m.put("Post URL", "URL de Publicación");m.put("Post Url", "URL de publicación");m.put("PowerShell", "PowerShell");- m.put("Powershell", "Powershell");m.put("Prefix Pattern", "Patrón de prefijo");m.put("Prefix the title with <code>WIP</code> or <code>[WIP]</code> to mark the pull request as work in progress","Prefija el título con <code>WIP</code> o <code>[WIP]</code> para marcar la solicitud de extracción como trabajo en progreso");@@ -3921,7 +3921,6 @@ public class Translation_es extends TranslationResourceBundle {m.put("Specify shell commands to execute under the <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>job working directory</a>","Especifique los comandos shell para ejecutar bajo el <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>espacio de trabajo del trabajo</a>");m.put("Specify shell executable to be used", "Especifique el ejecutable de shell a utilizar");- m.put("Specify shell to be used", "Especifique el shell a utilizar");m.put("Specify source param for SCP command, for instance <code>app.tar.gz</code>", "Especifique el parámetro de origen para el comando SCP, por ejemplo <code>app.tar.gz</code>");m.put("Specify space separated refs to pull from remote. '*' can be used in ref name for wildcard match<br><b class='text-danger'>NOTE:</b> branch/tag protection rule will be ignored when update branches/tags via this step","Especifique las referencias separadas por espacios para extraer del remoto. '*' puede usarse en el nombre de la referencia para coincidencia de patrones<br><b class='text-danger'>NOTA:</b> la regla de protección de ramas/etiquetas será ignorada al actualizar ramas/etiquetas mediante este paso");@@ -4201,10 +4200,6 @@ public class Translation_es extends TranslationResourceBundle {"Este ejecutor ejecuta trabajos de construcción como contenedores de Docker en máquinas remotas a través de <a href='/~administration/agents' target='_blank'>agentes</a>");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","Este ejecutor ejecuta trabajos de construcción como pods en un clúster de Kubernetes. No se requieren agentes.<b class='text-danger'>Nota:</b> Asegúrese de que la URL del servidor esté especificada correctamente en la configuración del sistema, ya que los pods de trabajo necesitan acceder a ella para descargar el código fuente y los artefactos");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",- "Este ejecutor ejecuta trabajos de construcción con la instalación de shell del servidor de OneDev.<br><b class='text-danger'>ADVERTENCIA</b>: Los trabajos que se ejecutan con este ejecutor tienen los mismos permisos que el proceso del servidor de OneDev. Asegúrese de que solo pueda ser utilizado por trabajos confiables");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",- "Este ejecutor ejecuta trabajos de construcción con la instalación de shell de máquinas remotas a través de <a href='/~administration/agents' target='_blank'>agentes</a><br><b class='text-danger'>ADVERTENCIA</b>: Los trabajos que se ejecutan con este ejecutor tienen los mismos permisos que el proceso del agente de OneDev. Asegúrese de que solo pueda ser utilizado por trabajos confiables");m.put("This field is required", "Este campo es obligatorio");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","Este filtro se utiliza para determinar la entrada LDAP del usuario actual. Por ejemplo: <i>(&(uid={0})(objectclass=person))</i>. En este ejemplo, <i>{0}</i> representa el nombre de inicio de sesión del usuario actual.");@@ -4264,8 +4259,6 @@ public class Translation_es extends TranslationResourceBundle {m.put("This property is imported from {0}", "Esta propiedad se importa desde {0}");m.put("This provisioner creates workspaces inside Docker containers on the OneDev server for\nsecurity and isolation purpose. It is currently not supported when OneDev server is\ninstalled inside Kubernetes cluster","Este aprovisionador crea espacios de trabajo dentro de contenedores Docker en el servidor OneDev para\nfines de seguridad y aislamiento. Actualmente no es compatible cuando el servidor OneDev está\ninstalado dentro de un clúster de Kubernetes");- m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have the same\npermission as the OneDev server process. Make sure it can only be used by trusted projects.\n",- "Este aprovisionador crea espacios de trabajo con la facilidad de shell del servidor OneDev, y requiere\nque tmux esté instalado en el servidor OneDev<br>\n<b class='text-danger'>ADVERTENCIA</b>: Los espacios de trabajo creados por este aprovisionador tienen la misma\npermiso que el proceso del servidor OneDev. Asegúrate de que solo pueda ser utilizado por proyectos de confianza.\n");m.put("This pull request has been discarded", "Esta solicitud de extracción ha sido descartada");m.put("This report will be displayed in pull request overview page if build is triggered by pull request","Este informe se mostrará en la página de resumen de la solicitud de extracción si la construcción es activada por una solicitud de extracción");@@ -5031,8 +5024,18 @@ public class Translation_es extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",- "Los datos del espacio de trabajo personal se guardarán aquí después de que se elimine un espacio de trabajo. Se compartirán con todos los espacios de trabajo creados posteriormente con la misma clave de usuario y ruta");+ m.put("PowerShell Executable", "Ejecutable de PowerShell");+ m.put("Shell Executable", "Ejecutable de Shell");+ m.put("Specify applicable jobs of this executor.\n<b class='text-danger'>WARNING</b>: Jobs running with this executor has same privilege as OneDev process.\nPlease make sure that only trusted jobs can use this executor",+ "Especifique los trabajos aplicables de este ejecutor.\n<b class='text-danger'>ADVERTENCIA</b>: Los trabajos que se ejecutan con este ejecutor tienen el mismo privilegio que el proceso de OneDev.\nPor favor, asegúrese de que solo trabajos de confianza puedan usar este ejecutor");+ m.put("This executor runs build jobs with OneDev server's shell facility", "Este ejecutor ejecuta trabajos de construcción con la facilidad de shell del servidor OneDev");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a>",+ "Este ejecutor ejecuta trabajos de construcción con la facilidad de shell de máquinas remotas a través de <a href='/~administration/agents' target='_blank'>agentes</a>");+ m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server",+ "Este aprovisionador crea espacios de trabajo con la facilidad de shell del servidor OneDev, y requiere\nque tmux esté instalado en el servidor OneDev");+ m.put("Use '*' or '?' for wildcard match", "Use '*' o '?' para coincidencia de comodines");+ m.put("Workspaces created by this provisioner have same privilege as OneDev server process.\nUse '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>.\nMultiple projects should be separated by space.<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have same privilege as OneDev server process.\nPlease make sure that only trusted projects can use this provisioner",+ "Los espacios de trabajo creados por este aprovisionador tienen el mismo privilegio que el proceso del servidor OneDev.\nUse '**', '*' o '?' para <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>coincidencia de comodines de ruta</a>.\nMúltiples proyectos deben ser separados por espacio.<br>\n<b class='text-danger'>ADVERTENCIA</b>: Los espacios de trabajo creados por este aprovisionador tienen el mismo privilegio que el proceso del servidor OneDev.\nPor favor, asegúrese de que solo proyectos de confianza puedan usar este aprovisionador");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.javaindex 26fe73315b..3f31d597f0 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java@@ -1388,7 +1388,6 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Excluded", "Exclu");m.put("Excluded Fields", "Champs exclus");m.put("Excluded Files for Review", "Fichiers exclus pour révision");- m.put("Executable", "Exécutable");m.put("Execute Commands", "Exécuter des commandes");m.put("Execute Commands via SSH", "Exécuter des commandes via SSH");m.put("Exit Impersonation", "Quitter l'imitation");@@ -2884,6 +2883,8 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Permanent link of this selection", "Lien permanent de cette sélection");m.put("Permission denied", "Permission refusée");m.put("Permission will be checked upon actual operation", "La permission sera vérifiée lors de l'opération réelle");+ m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",+ "Les données de l'espace de travail personnel seront enregistrées ici après la suppression d'un espace de travail. Elles seront partagées avec tous les espaces de travail créés ultérieurement avec la même clé utilisateur et le même chemin.");m.put("Physical memory in mega bytes", "Mémoire physique en mégaoctets");m.put("Pick Existing", "Choisir existant");m.put("Pin this issue", "Épingler ce problème");@@ -2963,7 +2964,6 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Post URL", "URL de publication");m.put("Post Url", "URL de publication");m.put("PowerShell", "PowerShell");- m.put("Powershell", "Powershell");m.put("Prefix Pattern", "Modèle de préfixe");m.put("Prefix the title with <code>WIP</code> or <code>[WIP]</code> to mark the pull request as work in progress","Préfixez le titre avec <code>WIP</code> ou <code>[WIP]</code> pour marquer la pull request comme en cours");@@ -3921,7 +3921,6 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Specify shell commands to execute under the <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>job working directory</a>","Spécifiez les commandes shell à exécuter sous <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>l'espace de travail du job</a>");m.put("Specify shell executable to be used", "Spécifiez l'exécutable shell à utiliser");- m.put("Specify shell to be used", "Spécifiez le shell à utiliser");m.put("Specify source param for SCP command, for instance <code>app.tar.gz</code>", "Spécifiez le paramètre source pour la commande SCP, par exemple <code>app.tar.gz</code>");m.put("Specify space separated refs to pull from remote. '*' can be used in ref name for wildcard match<br><b class='text-danger'>NOTE:</b> branch/tag protection rule will be ignored when update branches/tags via this step","Spécifiez les refs séparés par des espaces à tirer du distant. '*' peut être utilisé dans le nom du ref pour une correspondance par wildcard<br><b class='text-danger'>REMARQUE :</b> la règle de protection des branches/tags sera ignorée lors de la mise à jour des branches/tags via cette étape");@@ -4201,10 +4200,6 @@ public class Translation_fr extends TranslationResourceBundle {"Cet exécuteur exécute des tâches de construction en tant que conteneurs Docker sur des machines distantes via <a href='/~administration/agents' target='_blank'>agents</a>");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","Cet exécuteur exécute des tâches de construction en tant que pods dans un cluster Kubernetes. Aucun agent n'est requis.<b class='text-danger'>Remarque :</b> Assurez-vous que l'URL du serveur est correctement spécifiée dans les paramètres système, car les pods de tâches doivent y accéder pour télécharger les sources et les artefacts");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",- "Cet exécuteur exécute des travaux de construction avec la fonctionnalité shell du serveur OneDev.<br><b class='text-danger'>AVERTISSEMENT</b> : Les travaux exécutés avec cet exécuteur ont les mêmes permissions que le processus du serveur OneDev. Assurez-vous qu'il ne peut être utilisé que par des travaux de confiance");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",- "Cet exécuteur exécute des travaux de construction avec la fonctionnalité shell des machines distantes via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>AVERTISSEMENT</b> : Les travaux exécutés avec cet exécuteur ont les mêmes permissions que le processus de l'agent OneDev. Assurez-vous qu'il ne peut être utilisé que par des travaux de confiance");m.put("This field is required", "Ce champ est requis");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","Ce filtre est utilisé pour déterminer l'entrée LDAP de l'utilisateur actuel. Par exemple : <i>(&(uid={0})(objectclass=person))</i>. Dans cet exemple, <i>{0}</i> représente le nom de connexion de l'utilisateur actuel.");@@ -4264,8 +4259,6 @@ public class Translation_fr extends TranslationResourceBundle {m.put("This property is imported from {0}", "Cette propriété est importée de {0}");m.put("This provisioner creates workspaces inside Docker containers on the OneDev server for\nsecurity and isolation purpose. It is currently not supported when OneDev server is\ninstalled inside Kubernetes cluster","Ce provisionneur crée des espaces de travail à l'intérieur de conteneurs Docker sur le serveur OneDev pour\ndes raisons de sécurité et d'isolation. Il n'est actuellement pas pris en charge lorsque le serveur OneDev est\ninstallé à l'intérieur d'un cluster Kubernetes");- m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have the same\npermission as the OneDev server process. Make sure it can only be used by trusted projects.\n",- "Ce provisionneur crée des espaces de travail avec la fonctionnalité shell du serveur OneDev, et nécessite\nque tmux soit installé sur le serveur OneDev<br>\n<b class='text-danger'>AVERTISSEMENT</b> : Les espaces de travail créés par ce provisionneur ont les mêmes\npermissions que le processus du serveur OneDev. Assurez-vous qu'il ne peut être utilisé que par des projets de confiance.\n");m.put("This pull request has been discarded", "Cette demande de tirage a été abandonnée");m.put("This report will be displayed in pull request overview page if build is triggered by pull request","Ce rapport sera affiché sur la page d'aperçu des demandes de tirage si la construction est déclenchée par une demande de tirage");@@ -5031,8 +5024,18 @@ public class Translation_fr extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",- "Les données de l'espace de travail personnel seront enregistrées ici après la suppression d'un espace de travail. Elles seront partagées avec tous les espaces de travail créés ultérieurement avec la même clé utilisateur et le même chemin.");+ m.put("PowerShell Executable", "Exécutable PowerShell");+ m.put("Shell Executable", "Exécutable Shell");+ m.put("Specify applicable jobs of this executor.\n<b class='text-danger'>WARNING</b>: Jobs running with this executor has same privilege as OneDev process.\nPlease make sure that only trusted jobs can use this executor",+ "Spécifiez les travaux applicables de cet exécuteur.\n<b class='text-danger'>AVERTISSEMENT</b>: Les travaux exécutés avec cet exécuteur ont le même privilège que le processus OneDev.\nVeuillez vous assurer que seuls les travaux de confiance peuvent utiliser cet exécuteur");+ m.put("This executor runs build jobs with OneDev server's shell facility", "Cet exécuteur exécute des travaux de construction avec la fonctionnalité shell du serveur OneDev");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a>",+ "Cet exécuteur exécute des travaux de construction avec la fonctionnalité shell des machines distantes via <a href='/~administration/agents' target='_blank'>agents</a>");+ m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server",+ "Ce provisionneur crée des espaces de travail avec la fonctionnalité shell du serveur OneDev, et nécessite\nque tmux soit installé sur le serveur OneDev");+ m.put("Use '*' or '?' for wildcard match", "Utilisez '*' ou '?' pour une correspondance avec des jokers");+ m.put("Workspaces created by this provisioner have same privilege as OneDev server process.\nUse '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>.\nMultiple projects should be separated by space.<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have same privilege as OneDev server process.\nPlease make sure that only trusted projects can use this provisioner",+ "Les espaces de travail créés par ce provisionneur ont le même privilège que le processus du serveur OneDev.\nUtilisez '**', '*' ou '?' pour <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>la correspondance de chemin avec des jokers</a>.\nLes projets multiples doivent être séparés par un espace.<br>\n<b class='text-danger'>AVERTISSEMENT</b>: Les espaces de travail créés par ce provisionneur ont le même privilège que le processus du serveur OneDev.\nVeuillez vous assurer que seuls les projets de confiance peuvent utiliser ce provisionneur");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.javaindex b7501200a3..abde9fb7c7 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java@@ -1388,7 +1388,6 @@ public class Translation_it extends TranslationResourceBundle {m.put("Excluded", "Escluso");m.put("Excluded Fields", "Campi Esclusi");m.put("Excluded Files for Review", "File Esclusi per Revisione");- m.put("Executable", "Eseguibile");m.put("Execute Commands", "Esegui Comandi");m.put("Execute Commands via SSH", "Esegui Comandi tramite SSH");m.put("Exit Impersonation", "Esci dall'Impersonazione");@@ -2884,6 +2883,8 @@ public class Translation_it extends TranslationResourceBundle {m.put("Permanent link of this selection", "Collegamento permanente di questa selezione");m.put("Permission denied", "Permesso negato");m.put("Permission will be checked upon actual operation", "Il permesso sarà verificato durante l'operazione effettiva");+ m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",+ "I dati dell'area di lavoro personale verranno salvati qui dopo che un'area di lavoro è stata eliminata. Saranno condivisi con tutte le aree di lavoro create successivamente con la stessa chiave utente e percorso.");m.put("Physical memory in mega bytes", "Memoria fisica in megabyte");m.put("Pick Existing", "Seleziona esistente");m.put("Pin this issue", "Fissa questa issue");@@ -2963,7 +2964,6 @@ public class Translation_it extends TranslationResourceBundle {m.put("Post URL", "URL di Post");m.put("Post Url", "URL del post");m.put("PowerShell", "PowerShell");- m.put("Powershell", "Powershell");m.put("Prefix Pattern", "Modello di prefisso");m.put("Prefix the title with <code>WIP</code> or <code>[WIP]</code> to mark the pull request as work in progress","Prefissa il titolo con <code>WIP</code> o <code>[WIP]</code> per contrassegnare la pull request come lavoro in corso");@@ -3921,7 +3921,6 @@ public class Translation_it extends TranslationResourceBundle {m.put("Specify shell commands to execute under the <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>job working directory</a>","Specifica i comandi shell da eseguire sotto <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>job working directory</a>");m.put("Specify shell executable to be used", "Specifica l'eseguibile della shell da utilizzare");- m.put("Specify shell to be used", "Specifica la shell da utilizzare");m.put("Specify source param for SCP command, for instance <code>app.tar.gz</code>", "Specifica il parametro di origine per il comando SCP, ad esempio <code>app.tar.gz</code>");m.put("Specify space separated refs to pull from remote. '*' can be used in ref name for wildcard match<br><b class='text-danger'>NOTE:</b> branch/tag protection rule will be ignored when update branches/tags via this step","Specifica i ref separati da spazio da scaricare dal remoto. '*' può essere utilizzato nel nome del ref per la corrispondenza con caratteri jolly<br><b class='text-danger'>NOTA:</b> la regola di protezione di branch/tag verrà ignorata durante l'aggiornamento di branch/tag tramite questo passaggio");@@ -4201,10 +4200,6 @@ public class Translation_it extends TranslationResourceBundle {"Questo executor esegue i lavori di build come container docker su macchine remote tramite <a href='/~administration/agents' target='_blank'>agenti</a>");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","Questo executor esegue i lavori di build come pod in un cluster Kubernetes. Non sono richiesti agenti.<b class='text-danger'>Nota:</b> Assicurati che l'URL del server sia specificato correttamente nelle impostazioni di sistema poiché i pod di lavoro devono accedervi per scaricare sorgenti e artefatti");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",- "Questo executor esegue lavori di build con la funzionalità shell del server OneDev.<br><b class='text-danger'>ATTENZIONE</b>: I lavori eseguiti con questo executor hanno gli stessi permessi del processo del server OneDev. Assicurati che possa essere utilizzato solo da lavori fidati");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",- "Questo executor esegue lavori di build con la funzionalità shell di macchine remote tramite <a href='/~administration/agents' target='_blank'>agenti</a><br><b class='text-danger'>ATTENZIONE</b>: I lavori eseguiti con questo executor hanno gli stessi permessi del processo dell'agente OneDev. Assicurati che possa essere utilizzato solo da lavori fidati");m.put("This field is required", "Questo campo è obbligatorio");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","Questo filtro viene utilizzato per determinare la voce LDAP per l'utente corrente. Ad esempio: <i>(&(uid={0})(objectclass=person))</i>. In questo esempio, <i>{0}</i> rappresenta il nome di login dell'utente corrente.");@@ -4264,8 +4259,6 @@ public class Translation_it extends TranslationResourceBundle {m.put("This property is imported from {0}", "Questa proprietà è importata da {0}");m.put("This provisioner creates workspaces inside Docker containers on the OneDev server for\nsecurity and isolation purpose. It is currently not supported when OneDev server is\ninstalled inside Kubernetes cluster","Questo provisioner crea workspace all'interno di container Docker sul server OneDev per\nscopi di sicurezza e isolamento. Attualmente non è supportato quando il server OneDev è\ninstallato all'interno di un cluster Kubernetes");- m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have the same\npermission as the OneDev server process. Make sure it can only be used by trusted projects.\n",- "Questo provisioner crea workspace con la funzionalità shell del server OneDev e richiede\nche tmux sia installato sul server OneDev<br>\n<b class='text-danger'>ATTENZIONE</b>: I workspace creati da questo provisioner hanno le stesse\nautorizzazioni del processo del server OneDev. Assicurati che possa essere utilizzato solo da progetti fidati.\n");m.put("This pull request has been discarded", "Questa pull request è stata scartata");m.put("This report will be displayed in pull request overview page if build is triggered by pull request","Questo report verrà visualizzato nella pagina di panoramica della pull request se la build è attivata dalla pull request");@@ -5031,8 +5024,18 @@ public class Translation_it extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",- "I dati dell'area di lavoro personale verranno salvati qui dopo che un'area di lavoro è stata eliminata. Saranno condivisi con tutte le aree di lavoro create successivamente con la stessa chiave utente e percorso.");+ m.put("PowerShell Executable", "Eseguibile PowerShell");+ m.put("Shell Executable", "Eseguibile Shell");+ m.put("Specify applicable jobs of this executor.\n<b class='text-danger'>WARNING</b>: Jobs running with this executor has same privilege as OneDev process.\nPlease make sure that only trusted jobs can use this executor",+ "Specifica i lavori applicabili di questo esecutore.\n<b class='text-danger'>ATTENZIONE</b>: I lavori eseguiti con questo esecutore hanno lo stesso privilegio del processo OneDev.\nAssicurati che solo lavori fidati possano usare questo esecutore");+ m.put("This executor runs build jobs with OneDev server's shell facility", "Questo esecutore esegue lavori di build con la funzionalità shell del server OneDev");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a>",+ "Questo esecutore esegue lavori di build con la funzionalità shell delle macchine remote tramite <a href='/~administration/agents' target='_blank'>agenti</a>");+ m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server",+ "Questo provisioner crea spazi di lavoro con la funzionalità shell del server OneDev e richiede\ntmux installato sul server OneDev");+ m.put("Use '*' or '?' for wildcard match", "Usa '*' o '?' per la corrispondenza con caratteri jolly");+ m.put("Workspaces created by this provisioner have same privilege as OneDev server process.\nUse '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>.\nMultiple projects should be separated by space.<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have same privilege as OneDev server process.\nPlease make sure that only trusted projects can use this provisioner",+ "Gli spazi di lavoro creati da questo provisioner hanno lo stesso privilegio del processo del server OneDev.\nUsa '**', '*' o '?' per <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>corrispondenza con caratteri jolly nel percorso</a>.\nPiù progetti dovrebbero essere separati da uno spazio.<br>\n<b class='text-danger'>ATTENZIONE</b>: Gli spazi di lavoro creati da questo provisioner hanno lo stesso privilegio del processo del server OneDev.\nAssicurati che solo progetti fidati possano usare questo provisioner");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.javaindex 97cc387763..ae0d8b8503 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java@@ -1388,7 +1388,6 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Excluded", "除外済み");m.put("Excluded Fields", "除外されたフィールド");m.put("Excluded Files for Review", "レビュー対象外のファイル");- m.put("Executable", "実行可能");m.put("Execute Commands", "コマンドを実行する");m.put("Execute Commands via SSH", "SSH経由でコマンドを実行する");m.put("Exit Impersonation", "なりすましを終了する");@@ -2884,6 +2883,8 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Permanent link of this selection", "この選択の永久リンク");m.put("Permission denied", "権限が拒否されました");m.put("Permission will be checked upon actual operation", "実際の操作時に権限が確認されます");+ m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",+ "個人ワークスペースデータは、ワークスペースが削除された後にここに保存されます。それは、同じユーザーキーとパスで作成されたすべてのワークスペースに共有されます。");m.put("Physical memory in mega bytes", "物理メモリ(メガバイト単位)");m.put("Pick Existing", "既存を選択");m.put("Pin this issue", "この問題をピン留め");@@ -2963,7 +2964,6 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Post URL", "ポストURL");m.put("Post Url", "投稿URL");m.put("PowerShell", "PowerShell");- m.put("Powershell", "Powershell");m.put("Prefix Pattern", "プレフィックスパターン");m.put("Prefix the title with <code>WIP</code> or <code>[WIP]</code> to mark the pull request as work in progress","プルリクエストを作業中としてマークするには、タイトルに <code>WIP</code> または <code>[WIP]</code> を付けてください");@@ -3921,7 +3921,6 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Specify shell commands to execute under the <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>job working directory</a>","<a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>ジョブワークスペース</a>で実行するシェルコマンドを指定してください。");m.put("Specify shell executable to be used", "使用するシェル実行ファイルを指定してください");- m.put("Specify shell to be used", "使用するシェルを指定してください。");m.put("Specify source param for SCP command, for instance <code>app.tar.gz</code>", "SCPコマンドのソースパラメータを指定してください。例: <code>app.tar.gz</code>");m.put("Specify space separated refs to pull from remote. '*' can be used in ref name for wildcard match<br><b class='text-danger'>NOTE:</b> branch/tag protection rule will be ignored when update branches/tags via this step","リモートからプルするスペース区切りのリファレンスを指定してください。リファレンス名にはワイルドカードマッチのために'*'を使用できます。<br><b class='text-danger'>注意:</b> このステップでブランチ/タグを更新する際、ブランチ/タグ保護ルールは無視されます。");@@ -4201,10 +4200,6 @@ public class Translation_ja extends TranslationResourceBundle {"このエグゼキュータは、<a href='/~administration/agents' target='_blank'>エージェント</a>を介してリモートマシン上でDockerコンテナとしてビルドジョブを実行します");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","このエグゼキュータは、Kubernetesクラスター内のPodとしてビルドジョブを実行します。エージェントは不要です。<b class='text-danger'>注意:</b> ジョブPodがソースやアーティファクトをダウンロードするためにサーバーURLがシステム設定で正しく指定されていることを確認してください");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",- "このエグゼキュータはOneDevサーバーのシェル機能を使用してビルドジョブを実行します。<br><b class='text-danger'>警告</b>: このエグゼキュータで実行されるジョブはOneDevサーバープロセスと同じ権限を持ちます。信頼できるジョブでのみ使用されることを確認してください");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",- "このエグゼキュータは<a href='/~administration/agents' target='_blank'>エージェント</a>を介してリモートマシンのシェル機能を使用してビルドジョブを実行します。<br><b class='text-danger'>警告</b>: このエグゼキュータで実行されるジョブはOneDevエージェントプロセスと同じ権限を持ちます。信頼できるジョブでのみ使用されることを確認してください");m.put("This field is required", "このフィールドは必須です");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","このフィルターは現在のユーザーのLDAPエントリを決定するために使用されます。例: <i>(&(uid={0})(objectclass=person))</i>。この例では、<i>{0}</i>は現在のユーザーのログイン名を表します");@@ -4264,8 +4259,6 @@ public class Translation_ja extends TranslationResourceBundle {m.put("This property is imported from {0}", "このプロパティは{0}からインポートされます");m.put("This provisioner creates workspaces inside Docker containers on the OneDev server for\nsecurity and isolation purpose. It is currently not supported when OneDev server is\ninstalled inside Kubernetes cluster","このプロビジョナーは、セキュリティと隔離のためにOneDevサーバー上のDockerコンテナ内にワークスペースを作成します。\nOneDevサーバーがKubernetesクラスター内にインストールされている場合は現在サポートされていません");- m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have the same\npermission as the OneDev server process. Make sure it can only be used by trusted projects.\n",- "このプロビジョナーはOneDevサーバーのシェル機能を使用してワークスペースを作成し、\nOneDevサーバーにtmuxがインストールされている必要があります<br>\n<b class='text-danger'>警告</b>: このプロビジョナーで作成されたワークスペースは、\nOneDevサーバープロセスと同じ権限を持ちます。信頼できるプロジェクトでのみ使用できるようにしてください。\n");m.put("This pull request has been discarded", "このプルリクエストは破棄されました");m.put("This report will be displayed in pull request overview page if build is triggered by pull request","このレポートは、プルリクエストによってビルドがトリガーされた場合、プルリクエスト概要ページに表示されます");@@ -5031,8 +5024,18 @@ public class Translation_ja extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",- "個人ワークスペースデータは、ワークスペースが削除された後にここに保存されます。それは、同じユーザーキーとパスで作成されたすべてのワークスペースに共有されます。");+ m.put("PowerShell Executable", "PowerShell 実行可能ファイル");+ m.put("Shell Executable", "シェル実行可能ファイル");+ m.put("Specify applicable jobs of this executor.\n<b class='text-danger'>WARNING</b>: Jobs running with this executor has same privilege as OneDev process.\nPlease make sure that only trusted jobs can use this executor",+ "このエグゼキュータの適用可能なジョブを指定します。\n<b class='text-danger'>警告</b>: このエグゼキュータで実行されるジョブは OneDev プロセスと同じ権限を持ちます。\n信頼できるジョブのみがこのエグゼキュータを使用できるようにしてください");+ m.put("This executor runs build jobs with OneDev server's shell facility", "このエグゼキュータは OneDev サーバーのシェル機能でビルドジョブを実行します");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a>",+ "このエグゼキュータは <a href='/~administration/agents' target='_blank'>エージェント</a>を介してリモートマシンのシェル機能でビルドジョブを実行します");+ m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server",+ "このプロビジョナーは OneDev サーバーのシェル機能でワークスペースを作成し、\nOneDev サーバーに tmux がインストールされている必要があります");+ m.put("Use '*' or '?' for wildcard match", "ワイルドカードマッチには '*' または '?' を使用します");+ m.put("Workspaces created by this provisioner have same privilege as OneDev server process.\nUse '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>.\nMultiple projects should be separated by space.<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have same privilege as OneDev server process.\nPlease make sure that only trusted projects can use this provisioner",+ "このプロビジョナーによって作成されたワークスペースは OneDev サーバープロセスと同じ権限を持ちます。\n'**'、'*' または '?' を<a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>パスワイルドカードマッチ</a>に使用します。\n複数のプロジェクトはスペースで区切る必要があります。<br>\n<b class='text-danger'>警告</b>: このプロビジョナーによって作成されたワークスペースは OneDev サーバープロセスと同じ権限を持ちます。\n信頼できるプロジェクトのみがこのプロビジョナーを使用できるようにしてください");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.javaindex ad80d446c0..9f0d89066a 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java@@ -1388,7 +1388,6 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Excluded", "제외됨");m.put("Excluded Fields", "제외된 필드들");m.put("Excluded Files for Review", "검토에서 제외된 파일");- m.put("Executable", "실행 가능");m.put("Execute Commands", "명령 실행");m.put("Execute Commands via SSH", "SSH를 통해 명령 실행");m.put("Exit Impersonation", "가장 역할 종료");@@ -2884,6 +2883,8 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Permanent link of this selection", "이 선택의 영구 링크");m.put("Permission denied", "권한이 거부되었습니다");m.put("Permission will be checked upon actual operation", "실제 작업 시 권한이 확인됩니다");+ m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",+ "개인 작업 공간 데이터는 작업 공간이 삭제된 후 여기에 저장됩니다. 동일한 사용자 키와 경로로 이후에 생성된 모든 작업 공간에 공유됩니다.");m.put("Physical memory in mega bytes", "메가바이트 단위의 물리적 메모리");m.put("Pick Existing", "기존 항목 선택");m.put("Pin this issue", "이 이슈를 고정");@@ -2963,7 +2964,6 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Post URL", "포스트 URL");m.put("Post Url", "게시 URL");m.put("PowerShell", "PowerShell");- m.put("Powershell", "Powershell");m.put("Prefix Pattern", "접두사 패턴");m.put("Prefix the title with <code>WIP</code> or <code>[WIP]</code> to mark the pull request as work in progress","제목에 <code>WIP</code> 또는 <code>[WIP]</code>를 접두사로 추가하여 풀 리퀘스트를 진행 중인 작업으로 표시하십시오");@@ -3921,7 +3921,6 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Specify shell commands to execute under the <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>job working directory</a>","<a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>작업 공간</a> 아래에서 실행할 셸 명령을 지정하세요.");m.put("Specify shell executable to be used", "사용할 셸 실행 파일을 지정하세요");- m.put("Specify shell to be used", "사용할 셸을 지정하세요.");m.put("Specify source param for SCP command, for instance <code>app.tar.gz</code>", "SCP 명령의 소스 매개변수를 지정하세요. 예: <code>app.tar.gz</code>.");m.put("Specify space separated refs to pull from remote. '*' can be used in ref name for wildcard match<br><b class='text-danger'>NOTE:</b> branch/tag protection rule will be ignored when update branches/tags via this step","원격에서 가져올 공백으로 구분된 참조를 지정하세요. '*'는 참조 이름에서 와일드카드 매칭에 사용할 수 있습니다.<br><b class='text-danger'>참고:</b> 이 단계에서 브랜치/태그를 업데이트할 때 브랜치/태그 보호 규칙이 무시됩니다.");@@ -4201,10 +4200,6 @@ public class Translation_ko extends TranslationResourceBundle {"이 실행자는 <a href='/~administration/agents' target='_blank'>에이전트</a>를 통해 원격 머신에서 Docker 컨테이너로 빌드 작업을 실행합니다");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","이 실행자는 Kubernetes 클러스터에서 Pod로 빌드 작업을 실행합니다. 에이전트가 필요하지 않습니다.<b class='text-danger'>참고:</b> 작업 Pod가 소스 및 아티팩트를 다운로드하기 위해 시스템 설정에서 서버 URL이 올바르게 지정되었는지 확인하세요");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",- "이 실행자는 OneDev 서버의 셸 기능을 사용하여 빌드 작업을 실행합니다.<br><b class='text-danger'>경고</b>: 이 실행자를 사용하는 작업은 OneDev 서버 프로세스와 동일한 권한을 가집니다. 신뢰할 수 있는 작업에서만 사용되도록 해야 합니다");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",- "이 실행자는 <a href='/~administration/agents' target='_blank'>에이전트</a>를 통해 원격 머신의 셸 기능을 사용하여 빌드 작업을 실행합니다<br><b class='text-danger'>경고</b>: 이 실행자를 사용하는 작업은 OneDev 에이전트 프로세스와 동일한 권한을 가집니다. 신뢰할 수 있는 작업에서만 사용되도록 해야 합니다");m.put("This field is required", "이 필드는 필수입니다");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","이 필터는 현재 사용자의 LDAP 항목을 결정하는 데 사용됩니다. 예: <i>(&(uid={0})(objectclass=person))</i>. 이 예에서 <i>{0}</i>는 현재 사용자의 로그인 이름을 나타냅니다.");@@ -4264,8 +4259,6 @@ public class Translation_ko extends TranslationResourceBundle {m.put("This property is imported from {0}", "이 속성은 {0}에서 가져왔습니다");m.put("This provisioner creates workspaces inside Docker containers on the OneDev server for\nsecurity and isolation purpose. It is currently not supported when OneDev server is\ninstalled inside Kubernetes cluster","이 프로비저너는 보안 및 격리 목적으로 OneDev 서버에서 Docker 컨테이너 내에 워크스페이스를 생성합니다.\n현재 OneDev 서버가 Kubernetes 클러스터 내에 설치된 경우 지원되지 않습니다");- m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have the same\npermission as the OneDev server process. Make sure it can only be used by trusted projects.\n",- "이 프로비저너는 OneDev 서버의 셸 기능을 사용하여 워크스페이스를 생성하며,\nOneDev 서버에 tmux가 설치되어 있어야 합니다<br>\n<b class='text-danger'>경고</b>: 이 프로비저너로 생성된 워크스페이스는 OneDev 서버 프로세스와 동일한\n권한을 가집니다. 신뢰할 수 있는 프로젝트에서만 사용되도록 하십시오.\n");m.put("This pull request has been discarded", "이 풀 리퀘스트는 폐기되었습니다");m.put("This report will be displayed in pull request overview page if build is triggered by pull request","이 보고서는 빌드가 풀 리퀘스트에 의해 트리거된 경우 풀 리퀘스트 개요 페이지에 표시됩니다");@@ -5031,8 +5024,18 @@ public class Translation_ko extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",- "개인 작업 공간 데이터는 작업 공간이 삭제된 후 여기에 저장됩니다. 동일한 사용자 키와 경로로 이후에 생성된 모든 작업 공간에 공유됩니다.");+ m.put("PowerShell Executable", "PowerShell 실행 파일");+ m.put("Shell Executable", "셸 실행 파일");+ m.put("Specify applicable jobs of this executor.\n<b class='text-danger'>WARNING</b>: Jobs running with this executor has same privilege as OneDev process.\nPlease make sure that only trusted jobs can use this executor",+ "이 실행기에 적용 가능한 작업을 지정하십시오.\n<b class='text-danger'>경고</b>: 이 실행기로 실행되는 작업은 OneDev 프로세스와 동일한 권한을 가집니다.\n신뢰할 수 있는 작업만 이 실행기를 사용할 수 있도록 하십시오");+ m.put("This executor runs build jobs with OneDev server's shell facility", "이 실행기는 OneDev 서버의 셸 기능으로 빌드 작업을 실행합니다");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a>",+ "이 실행기는 <a href='/~administration/agents' target='_blank'>에이전트</a>를 통해 원격 머신의 셸 기능으로 빌드 작업을 실행합니다");+ m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server",+ "이 프로비저너는 OneDev 서버의 셸 기능으로 작업 공간을 생성하며,\nOneDev 서버에 tmux가 설치되어 있어야 합니다");+ m.put("Use '*' or '?' for wildcard match", "와일드카드 매칭에 '*' 또는 '?'를 사용하십시오");+ m.put("Workspaces created by this provisioner have same privilege as OneDev server process.\nUse '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>.\nMultiple projects should be separated by space.<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have same privilege as OneDev server process.\nPlease make sure that only trusted projects can use this provisioner",+ "이 프로비저너에 의해 생성된 작업 공간은 OneDev 서버 프로세스와 동일한 권한을 가집니다.\n<a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>경로 와일드카드 매칭</a>에 '**', '*' 또는 '?'를 사용하십시오.\n여러 프로젝트는 공백으로 구분해야 합니다.<br>\n<b class='text-danger'>경고</b>: 이 프로비저너에 의해 생성된 작업 공간은 OneDev 서버 프로세스와 동일한 권한을 가집니다.\n신뢰할 수 있는 프로젝트만 이 프로비저너를 사용할 수 있도록 하십시오");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.javaindex ef0596bc98..cb0ee3ac56 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java@@ -1388,7 +1388,6 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Excluded", "Excluído");m.put("Excluded Fields", "Campos Excluídos");m.put("Excluded Files for Review", "Arquivos Excluídos para Revisão");- m.put("Executable", "Executável");m.put("Execute Commands", "Executar Comandos");m.put("Execute Commands via SSH", "Executar Comandos via SSH");m.put("Exit Impersonation", "Sair da Impersonação");@@ -2884,6 +2883,8 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Permanent link of this selection", "Link permanente desta seleção");m.put("Permission denied", "Permissão negada");m.put("Permission will be checked upon actual operation", "A permissão será verificada na operação real");+ m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",+ "Os dados do espaço de trabalho pessoal serão salvos aqui após a exclusão de um espaço de trabalho. Eles serão compartilhados com todos os espaços de trabalho criados posteriormente com a mesma chave de usuário e caminho.");m.put("Physical memory in mega bytes", "Memória física em megabytes");m.put("Pick Existing", "Selecionar Existente");m.put("Pin this issue", "Fixar este problema");@@ -2963,7 +2964,6 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Post URL", "URL de Postagem");m.put("Post Url", "URL de Postagem");m.put("PowerShell", "PowerShell");- m.put("Powershell", "Powershell");m.put("Prefix Pattern", "Padrão de Prefixo");m.put("Prefix the title with <code>WIP</code> or <code>[WIP]</code> to mark the pull request as work in progress","Prefixe o título com <code>WIP</code> ou <code>[WIP]</code> para marcar o pull request como trabalho em andamento");@@ -3921,7 +3921,6 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Specify shell commands to execute under the <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>job working directory</a>","Especifique os comandos shell para executar sob o <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>espaço de trabalho do trabalho</a>");m.put("Specify shell executable to be used", "Especifique o executável de shell a ser usado");- m.put("Specify shell to be used", "Especifique o shell a ser usado");m.put("Specify source param for SCP command, for instance <code>app.tar.gz</code>", "Especifique o parâmetro de origem para o comando SCP, por exemplo <code>app.tar.gz</code>");m.put("Specify space separated refs to pull from remote. '*' can be used in ref name for wildcard match<br><b class='text-danger'>NOTE:</b> branch/tag protection rule will be ignored when update branches/tags via this step","Especifique os refs separados por espaço para puxar do remoto. '*' pode ser usado no nome do ref para correspondência de curinga<br><b class='text-danger'>NOTA:</b> a regra de proteção de branch/tag será ignorada ao atualizar branches/tags através desta etapa");@@ -4201,10 +4200,6 @@ public class Translation_pt extends TranslationResourceBundle {"Este executor executa trabalhos de build como contêineres Docker em máquinas remotas via <a href='/~administration/agents' target='_blank'>agentes</a>");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","Este executor executa trabalhos de build como pods em um cluster Kubernetes. Nenhum agente é necessário.<b class='text-danger'>Nota:</b> Certifique-se de que a URL do servidor está especificada corretamente nas configurações do sistema, pois os pods de trabalho precisam acessá-la para baixar o código-fonte e os artefatos");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",- "Este executor executa trabalhos de construção com a funcionalidade de shell do servidor OneDev.<br><b class='text-danger'>AVISO</b>: Trabalhos executados com este executor têm as mesmas permissões que o processo do servidor OneDev. Certifique-se de que ele só possa ser usado por trabalhos confiáveis");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",- "Este executor executa trabalhos de construção com a funcionalidade de shell de máquinas remotas via <a href='/~administration/agents' target='_blank'>agentes</a><br><b class='text-danger'>AVISO</b>: Trabalhos executados com este executor têm as mesmas permissões que o processo do agente OneDev. Certifique-se de que ele só possa ser usado por trabalhos confiáveis");m.put("This field is required", "Este campo é obrigatório");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","Este filtro é usado para determinar a entrada LDAP do usuário atual. Por exemplo: <i>(&(uid={0})(objectclass=person))</i>. Neste exemplo, <i>{0}</i> representa o nome de login do usuário atual.");@@ -4264,8 +4259,6 @@ public class Translation_pt extends TranslationResourceBundle {m.put("This property is imported from {0}", "Esta propriedade é importada de {0}");m.put("This provisioner creates workspaces inside Docker containers on the OneDev server for\nsecurity and isolation purpose. It is currently not supported when OneDev server is\ninstalled inside Kubernetes cluster","Este provisionador cria workspaces dentro de contêineres Docker no servidor OneDev para\nfins de segurança e isolamento. Atualmente não é suportado quando o servidor OneDev está\ninstalado dentro de um cluster Kubernetes");- m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have the same\npermission as the OneDev server process. Make sure it can only be used by trusted projects.\n",- "Este provisionador cria workspaces com a facilidade de shell do servidor OneDev e requer\ntmux instalado no servidor OneDev<br>\n<b class='text-danger'>AVISO</b>: Workspaces criados por este provisionador têm a mesma\npermissão que o processo do servidor OneDev. Certifique-se de que só possa ser usado por projetos confiáveis.\n");m.put("This pull request has been discarded", "Este pull request foi descartado");m.put("This report will be displayed in pull request overview page if build is triggered by pull request","Este relatório será exibido na página de visão geral do pull request se a build for acionada por um pull request");@@ -5031,8 +5024,18 @@ public class Translation_pt extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",- "Os dados do espaço de trabalho pessoal serão salvos aqui após a exclusão de um espaço de trabalho. Eles serão compartilhados com todos os espaços de trabalho criados posteriormente com a mesma chave de usuário e caminho.");+ m.put("PowerShell Executable", "Executável PowerShell");+ m.put("Shell Executable", "Executável Shell");+ m.put("Specify applicable jobs of this executor.\n<b class='text-danger'>WARNING</b>: Jobs running with this executor has same privilege as OneDev process.\nPlease make sure that only trusted jobs can use this executor",+ "Especifique os trabalhos aplicáveis deste executor.\n<b class='text-danger'>AVISO</b>: Trabalhos executados com este executor têm o mesmo privilégio que o processo do OneDev.\nPor favor, certifique-se de que apenas trabalhos confiáveis possam usar este executor");+ m.put("This executor runs build jobs with OneDev server's shell facility", "Este executor executa trabalhos de construção com a facilidade de shell do servidor OneDev");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a>",+ "Este executor executa trabalhos de construção com a facilidade de shell de máquinas remotas via <a href='/~administration/agents' target='_blank'>agentes</a>");+ m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server",+ "Este provisionador cria espaços de trabalho com a facilidade de shell do servidor OneDev, e requer\ntmux instalado no servidor OneDev");+ m.put("Use '*' or '?' for wildcard match", "Use '*' ou '?' para correspondência de curinga");+ m.put("Workspaces created by this provisioner have same privilege as OneDev server process.\nUse '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>.\nMultiple projects should be separated by space.<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have same privilege as OneDev server process.\nPlease make sure that only trusted projects can use this provisioner",+ "Espaços de trabalho criados por este provisionador têm o mesmo privilégio que o processo do servidor OneDev.\nUse '**', '*' ou '?' para <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>correspondência de curinga de caminho</a>.\nMúltiplos projetos devem ser separados por espaço.<br>\n<b class='text-danger'>AVISO</b>: Espaços de trabalho criados por este provisionador têm o mesmo privilégio que o processo do servidor OneDev.\nPor favor, certifique-se de que apenas projetos confiáveis possam usar este provisionador");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.javaindex 765973fe15..6cf9847d94 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java@@ -1414,7 +1414,6 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Excluded", "排除");m.put("Excluded Fields", "排除字段");m.put("Excluded Files for Review", "排除的审查文件");- m.put("Executable", "可执行文件");m.put("Execute Commands", "执行命令");m.put("Execute Commands via SSH", "通过 SSH 执行命令");m.put("Exit Impersonation", "退出假装");@@ -2910,6 +2909,8 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Permanent link of this selection", "此选择的永久链接");m.put("Permission denied", "权限不足");m.put("Permission will be checked upon actual operation", "权限将在实际操作时检查");+ m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",+ "个人工作区数据将在工作区删除后保存在此处。它将共享给所有后续创建的具有相同用户键和路径的工作区。");m.put("Physical memory in mega bytes", "物理内存(兆字节)");m.put("Pick Existing", "选择现有");m.put("Pin this issue", "置顶此工单");@@ -2989,7 +2990,6 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Post URL", "发布 URL");m.put("Post Url", "发布 URL");m.put("PowerShell", "PowerShell");- m.put("Powershell", "Powershell");m.put("Prefix Pattern", "前缀模式");m.put("Prefix the title with <code>WIP</code> or <code>[WIP]</code> to mark the pull request as work in progress","在标题前加上 <code>WIP</code> 或 <code>[WIP]</code> 以标记拉取请求为进行中的工作");@@ -3947,7 +3947,6 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Specify shell commands to execute under the <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>job working directory</a>","指定在 <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>任务工作区</a> 下执行的 shell 命令");m.put("Specify shell executable to be used", "指定要使用的 shell 可执行文件");- m.put("Specify shell to be used", "指定要使用的 shell");m.put("Specify source param for SCP command, for instance <code>app.tar.gz</code>", "指定 SCP 命令的源参数,例如 <code>app.tar.gz</code>");m.put("Specify space separated refs to pull from remote. '*' can be used in ref name for wildcard match<br><b class='text-danger'>NOTE:</b> branch/tag protection rule will be ignored when update branches/tags via this step","指定从远程拉取的以空格分隔的引用。引用名称中可使用 '*' 进行通配符匹配<br><b class='text-danger'>注意:</b> 通过此步骤更新分支/标签时,将忽略分支/标签保护规则");@@ -4227,10 +4226,6 @@ public class Translation_zh extends TranslationResourceBundle {"此执行器通过 <a href='/~administration/agents' target='_blank'>代理</a> 在远程机器上以 Docker 容器运行构建任务");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","此执行器在 Kubernetes 集群中以 Pod 形式运行构建任务,无需任何代理。<b class='text-danger'>注意:</b> 确保在系统设置中正确指定服务器 URL,因为任务 Pod 需要访问它以下载源代码和产物");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",- "此执行器使用 OneDev 服务器的 shell 功能运行构建作业。<br><b class='text-danger'>警告</b>:使用此执行器运行的作业具有与 OneDev 服务器进程相同的权限。请确保它仅能被可信的作业使用");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",- "此执行器通过 <a href='/~administration/agents' target='_blank'>代理</a>使用远程机器的 shell 功能运行构建作业<br><b class='text-danger'>警告</b>:使用此执行器运行的作业具有与 OneDev 代理进程相同的权限。请确保它仅能被可信的作业使用");m.put("This field is required", "此字段是必填的");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","此过滤器用于确定当前用户的 LDAP 条目。例如:<i>(&(uid={0})(objectclass=person))</i>。在此示例中,<i>{0}</i> 表示当前用户的登录名");@@ -4290,8 +4285,6 @@ public class Translation_zh extends TranslationResourceBundle {m.put("This property is imported from {0}", "此属性是从 {0} 导入的");m.put("This provisioner creates workspaces inside Docker containers on the OneDev server for\nsecurity and isolation purpose. It is currently not supported when OneDev server is\ninstalled inside Kubernetes cluster","此配置器在 OneDev 服务器上的 Docker 容器中创建工作区,以实现\n安全和隔离目的。当 OneDev 服务器安装在 Kubernetes 集群中时,当前不支持");- m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have the same\npermission as the OneDev server process. Make sure it can only be used by trusted projects.\n",- "此配置器使用 OneDev 服务器的 shell 功能创建工作区,并要求\n在 OneDev 服务器上安装 tmux<br>\n<b class='text-danger'>警告</b>:此配置器创建的工作区具有与 OneDev 服务器进程相同的\n权限。确保它只能被信任的项目使用。\n");m.put("This pull request has been discarded", "此合并请求已丢弃");m.put("This report will be displayed in pull request overview page if build is triggered by pull request","如果构建由合并请求触发,此报告将显示在合并请求概览页面中");@@ -5057,8 +5050,18 @@ public class Translation_zh extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "不能为空");m.put("{javax.validation.constraints.NotNull.message}", "不能为空");m.put("{javax.validation.constraints.Size.message}", "至少需要指定一个值");- m.put("Personal workspace data will be saved here after a workspace is deleted. It will be shared to all workspaces created subsequently with same user key and path",- "个人工作区数据将在工作区删除后保存在此处。它将共享给所有后续创建的具有相同用户键和路径的工作区。");+ m.put("PowerShell Executable", "PowerShell 可执行文件");+ m.put("Shell Executable", "Shell 可执行文件");+ m.put("Specify applicable jobs of this executor.\n<b class='text-danger'>WARNING</b>: Jobs running with this executor has same privilege as OneDev process.\nPlease make sure that only trusted jobs can use this executor",+ "指定此执行器适用的任务。\n<b class='text-danger'>警告</b>:使用此执行器运行的任务具有与 OneDev 进程相同的权限。\n请确保只有受信任的任务可以使用此执行器");+ m.put("This executor runs build jobs with OneDev server's shell facility", "此执行器使用 OneDev 服务器的 shell 功能运行构建任务");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a>",+ "此执行器通过<a href='/~administration/agents' target='_blank'>代理</a>使用远程机器的 shell 功能运行构建任务");+ m.put("This provisioner creates workspaces with OneDev server's shell facility, and requires\ntmux to be installed on OneDev server",+ "此配置器使用 OneDev 服务器的 shell 功能创建工作区,并要求在 OneDev 服务器上安装 tmux");+ m.put("Use '*' or '?' for wildcard match", "使用 '*' 或 '?' 进行通配符匹配");+ m.put("Workspaces created by this provisioner have same privilege as OneDev server process.\nUse '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>.\nMultiple projects should be separated by space.<br>\n<b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have same privilege as OneDev server process.\nPlease make sure that only trusted projects can use this provisioner",+ "此配置器创建的工作区具有与 OneDev 服务器进程相同的权限。\n使用 '**'、'*' 或 '?' 进行<a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>路径通配符匹配</a>。\n多个项目应以空格分隔。<br>\n<b class='text-danger'>警告</b>:此配置器创建的工作区具有与 OneDev 服务器进程相同的权限。\n请确保只有受信任的项目可以使用此配置器");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.javaindex e196d54aff..073597cd05 100644--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java@@ -58,7 +58,6 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;-import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.k8shelper.DefaultCloneInfo;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.OneDev;@@ -622,9 +621,8 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>private boolean isApplicable(Workspace workspace, WorkspaceSpec spec, WorkspaceProvisioner provisioner) {if (spec.isRunInContainer() != (provisioner instanceof DockerAware))return false;-- return provisioner.getApplicableProjects() == null- || WildcardUtils.matchPath(provisioner.getApplicableProjects(), workspace.getProject().getPath());+ else+ return provisioner.isApplicable(workspace.getProject());}private WorkspaceProvisioner getProvisioner(Workspace workspace, WorkspaceSpec spec, TaskLogger logger) {diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex 304862d090..c769c3b039 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -86,6 +86,8 @@ import io.onedev.server.job.JobContext;import io.onedev.server.job.JobRunnable;import io.onedev.server.job.JobService;import io.onedev.server.job.JobTerminal;+import io.onedev.server.job.match.JobMatch;+import io.onedev.server.job.match.JobMatchContext;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.model.support.administration.jobexecutor.KubernetesAware;import io.onedev.server.model.support.administration.jobexecutor.NodeSelectorEntry;@@ -248,6 +250,26 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,this.alwaysPullImage = alwaysPullImage;}+ @Editable(order=10000, name="Applicable Jobs", placeholder="Any job",+ description="Optionally specify applicable jobs of this executor")+ @io.onedev.server.annotation.JobMatch(withProjectCriteria = true, withJobCriteria = true)+ @Nullable+ public String getJobMatch() {+ return jobMatch;+ }++ public void setJobMatch(String jobMatch) {+ this.jobMatch = jobMatch;+ }++ @Override+ public boolean isApplicable(JobMatchContext context) {+ if (jobMatch != null)+ return JobMatch.parse(jobMatch, true, true).matches(context);+ else+ return true;+ }+@Editable(order=500, group = "More Settings", description="Optionally specify node selector of the job pods")@Validpublic List<NodeSelectorEntry> getNodeSelector() {diff --git a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.javaindex 01d58ad8bc..7ba04eff6a 100644--- a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java+++ b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java@@ -33,9 +33,7 @@ import io.onedev.server.service.support.AgentRunnable;import io.onedev.server.terminal.Shell;@Editable(order=500, name="Remote Shell Executor", description=""- + "This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br>"- + "<b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. "- + "Make sure it can only be used by trusted jobs")+ + "This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a>")public class RemoteShellExecutor extends ServerShellExecutor {private static final long serialVersionUID = 1L;diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex 741a53051d..5bfbe8eb50 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -78,6 +78,8 @@ import io.onedev.server.job.JobContext;import io.onedev.server.job.JobRunnable;import io.onedev.server.job.JobService;import io.onedev.server.job.JobTerminal;+import io.onedev.server.job.match.JobMatch;+import io.onedev.server.job.match.JobMatchContext;import io.onedev.server.model.support.administration.DockerAware;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.model.support.administration.jobexecutor.RegistryLogin;@@ -151,6 +153,26 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Tethis.concurrency = concurrency;}+ @Editable(order=10000, name="Applicable Jobs", placeholder="Any job",+ description="Optionally specify applicable jobs of this executor")+ @io.onedev.server.annotation.JobMatch(withProjectCriteria = true, withJobCriteria = true)+ @Nullable+ public String getJobMatch() {+ return jobMatch;+ }++ public void setJobMatch(String jobMatch) {+ this.jobMatch = jobMatch;+ }++ @Override+ public boolean isApplicable(JobMatchContext context) {+ if (jobMatch != null)+ return JobMatch.parse(jobMatch, true, true).matches(context);+ else+ return true;+ }+@Editable(order=510, group="More Settings", placeholder="Default", description="Optionally specify docker sock to use. "+ "Defaults to <i>/var/run/docker.sock</i>")public String getDockerSockPath() {diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.javaindex 89c34a540e..e7886903b0 100644--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java@@ -55,6 +55,8 @@ import io.onedev.server.job.JobContext;import io.onedev.server.job.JobRunnable;import io.onedev.server.job.JobService;import io.onedev.server.job.JobTerminal;+import io.onedev.server.job.match.JobMatch;+import io.onedev.server.job.match.JobMatchContext;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.plugin.executor.servershell.ServerShellExecutor.TestData;import io.onedev.server.service.ResourceService;@@ -63,9 +65,7 @@ import io.onedev.server.terminal.Shell;import io.onedev.server.web.util.Testable;@Editable(order=ServerShellExecutor.ORDER, name="Server Shell Executor", description="" +- "This executor runs build jobs with OneDev server's shell facility.<br>" +- "<b class='text-danger'>WARNING</b>: Jobs running with this executor has same " +- "permission as OneDev server process. Make sure it can only be used by trusted jobs")+ "This executor runs build jobs with OneDev server's shell facility")public class ServerShellExecutor extends JobExecutor implements Testable<TestData> {private static final long serialVersionUID = 1L;@@ -73,7 +73,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatstatic final int ORDER = 400;private String concurrency;-+private transient volatile LeafFacade runningStep;private transient volatile File buildDir;@@ -90,6 +90,28 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatthis.concurrency = concurrency;}+ @Editable(order=10000, name="Applicable Jobs", description="""+ Specify applicable jobs of this executor.+ <b class='text-danger'>WARNING</b>: Jobs running with this executor has same privilege as OneDev process.+ Please make sure that only trusted jobs can use this executor""")+ @io.onedev.server.annotation.JobMatch(withProjectCriteria = true, withJobCriteria = true)+ @NotEmpty+ public String getJobMatch() {+ return jobMatch;+ }++ public void setJobMatch(String jobMatch) {+ this.jobMatch = jobMatch;+ }++ @Override+ public boolean isApplicable(JobMatchContext context) {+ if (jobMatch != null)+ return JobMatch.parse(jobMatch, true, true).matches(context);+ else+ return false;+ }+private ClusterService getClusterService() {return OneDev.getInstance(ClusterService.class);}diff --git a/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java b/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.javaindex 726b93db52..f658939d6c 100644--- a/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java+++ b/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java@@ -34,25 +34,30 @@ import com.google.common.base.Preconditions;import io.onedev.agent.AgentUtils;import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;+import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.k8shelper.RegistryLoginFacade;import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;+import io.onedev.server.annotation.Patterns;import io.onedev.server.annotation.ReservedOptions;import io.onedev.server.cache.WorkspaceCacheProvisioner;+import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.DockerAware;import io.onedev.server.model.support.administration.workspaceprovisioner.RegistryLogin;import io.onedev.server.model.support.administration.workspaceprovisioner.WorkspaceProvisioner;import io.onedev.server.terminal.CommandlineShell;import io.onedev.server.terminal.Shell;import io.onedev.server.terminal.Terminal;+import io.onedev.server.web.util.SuggestionUtils;import io.onedev.server.web.util.Testable;import io.onedev.server.workspace.GitExecutionResult;import io.onedev.server.workspace.WorkspaceContext;@@ -139,6 +144,16 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwathis.mountDockerSock = mountDockerSock;}+ @Editable(order=510, group="More Settings", placeholder="Default", description="Optionally specify docker sock to use. "+ + "Defaults to <i>/var/run/docker.sock</i>")+ public String getDockerSockPath() {+ return dockerSockPath;+ }++ public void setDockerSockPath(String dockerSockPath) {+ this.dockerSockPath = dockerSockPath;+ }+@Editable(order=600, group="Security Settings", description = "Whether or not to always pull image when "+ "running container. This option should be enabled to avoid images being replaced by "+ "malicious operations")@@ -150,14 +165,21 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwathis.alwaysPullImage = alwaysPullImage;}- @Editable(order=510, group="More Settings", placeholder="Default", description="Optionally specify docker sock to use. "- + "Defaults to <i>/var/run/docker.sock</i>")- public String getDockerSockPath() {- return dockerSockPath;+ @Editable(order=10000, placeholder="Any project", description="Optionally specify projects applicable for this provisioner. " ++ "Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. " ++ "Multiple projects should be separated by space")+ @Patterns(suggester="suggestProjects", path=true)+ public String getApplicableProjects() {+ return applicableProjects;}- public void setDockerSockPath(String dockerSockPath) {- this.dockerSockPath = dockerSockPath;+ public void setApplicableProjects(String applicableProjects) {+ this.applicableProjects = applicableProjects;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestProjects(String matchWith) {+ return SuggestionUtils.suggestProjectPaths(matchWith);}@Editable(order=50050, group="More Settings", description="Optionally specify docker options to run container. " +@@ -610,4 +632,9 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwareturn getRegistryLoginFacades(token);}+ @Override+ public boolean isApplicable(Project project) {+ return getApplicableProjects() == null || WildcardUtils.matchPath(getApplicableProjects(), project.getPath());+ }+}diff --git a/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java b/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.javaindex f1c95bb91a..a1a7f61623 100644--- a/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java+++ b/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java@@ -8,36 +8,41 @@ import java.io.File;import java.io.IOException;import java.nio.charset.StandardCharsets;import java.util.Arrays;+import java.util.List;import java.util.concurrent.CountDownLatch;-import io.onedev.server.git.hook.HookUtils;-import io.onedev.server.workspace.GitExecutionResult;+import javax.validation.constraints.NotEmpty;+import org.apache.commons.io.FilenameUtils;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.commons.utils.command.Commandline;+import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Patterns;import io.onedev.server.cache.WorkspaceCacheProvisioner;import io.onedev.server.git.CommandUtils;+import io.onedev.server.git.hook.HookUtils;+import io.onedev.server.model.Project;import io.onedev.server.model.Workspace;import io.onedev.server.model.support.administration.workspaceprovisioner.WorkspaceProvisioner;import io.onedev.server.terminal.CommandlineShell;import io.onedev.server.terminal.Shell;import io.onedev.server.terminal.Terminal;+import io.onedev.server.web.util.SuggestionUtils;import io.onedev.server.web.util.Testable;+import io.onedev.server.workspace.GitExecutionResult;import io.onedev.server.workspace.WorkspaceContext;import io.onedev.server.workspace.WorkspaceRuntime;@Editable(order=ShellProvisioner.ORDER, name="Shell Provisioner", description="""This provisioner creates workspaces with OneDev server's shell facility, and requires- tmux to be installed on OneDev server<br>- <b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have the same- permission as the OneDev server process. Make sure it can only be used by trusted projects.- """)+ tmux to be installed on OneDev server""")public class ShellProvisioner extends WorkspaceProvisioner implements Testable<Testable.None> {private static final long serialVersionUID = 1L;@@ -77,7 +82,28 @@ public class ShellProvisioner extends WorkspaceProvisioner implements Testable<Ttmux = "tmux";return new Commandline(tmux);}++ @Editable(order=10000, description="""+ Workspaces created by this provisioner have same privilege as OneDev server process.+ Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>.+ Multiple projects should be separated by space.<br>+ <b class='text-danger'>WARNING</b>: Workspaces created by this provisioner have same privilege as OneDev server process.+ Please make sure that only trusted projects can use this provisioner""")+ @Patterns(suggester="suggestProjects", path=true)+ @NotEmpty+ public String getApplicableProjects() {+ return applicableProjects;+ }++ public void setApplicableProjects(String applicableProjects) {+ this.applicableProjects = applicableProjects;+ }+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestProjects(String matchWith) {+ return SuggestionUtils.suggestProjectPaths(matchWith);+ }+@Overridepublic WorkspaceRuntime provision(WorkspaceContext context, TaskLogger logger) {checkApplicable();@@ -171,4 +197,9 @@ public class ShellProvisioner extends WorkspaceProvisioner implements Testable<T};}+ @Override+ public boolean isApplicable(Project project) {+ return WildcardUtils.matchPath(getApplicableProjects(), project.getPath());+ }+}