The Unified and Autonomous Development Platform
Refacor system setting
Robin Shenb1b2ab6fe267
diff --git a/server-core/src/main/java/io/onedev/server/git/config/SpecifiedCurl.java b/server-core/src/main/java/io/onedev/server/git/config/SpecifiedCurl.javaindex c9d72f51c1..b502ca7bf5 100644--- a/server-core/src/main/java/io/onedev/server/git/config/SpecifiedCurl.java+++ b/server-core/src/main/java/io/onedev/server/git/config/SpecifiedCurl.java@@ -4,7 +4,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;-@Editable(name="Use Specified curl", order=200)+@Editable(name="Use Specified curl Command Line", order=200)public class SpecifiedCurl extends CurlConfig {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/git/config/SpecifiedGit.java b/server-core/src/main/java/io/onedev/server/git/config/SpecifiedGit.javaindex 16e18ad4f8..8fee7949f8 100644--- a/server-core/src/main/java/io/onedev/server/git/config/SpecifiedGit.java+++ b/server-core/src/main/java/io/onedev/server/git/config/SpecifiedGit.java@@ -4,7 +4,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;-@Editable(name="Use Specified git", order=200)+@Editable(name="Use Specified Git Command Line", order=200)public class SpecifiedGit extends GitConfig {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/git/config/SystemCurl.java b/server-core/src/main/java/io/onedev/server/git/config/SystemCurl.javaindex 1262444ba5..d1bc112f79 100644--- a/server-core/src/main/java/io/onedev/server/git/config/SystemCurl.java+++ b/server-core/src/main/java/io/onedev/server/git/config/SystemCurl.java@@ -2,7 +2,7 @@ package io.onedev.server.git.config;import io.onedev.server.web.editable.annotation.Editable;-@Editable(name="Use curl in System Path", order=100)+@Editable(name="Use curl Command Line in System Path", order=100)public class SystemCurl extends CurlConfig {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/git/config/SystemGit.java b/server-core/src/main/java/io/onedev/server/git/config/SystemGit.javaindex ddc6ef4de0..717ed8c269 100644--- a/server-core/src/main/java/io/onedev/server/git/config/SystemGit.java+++ b/server-core/src/main/java/io/onedev/server/git/config/SystemGit.java@@ -6,7 +6,7 @@ import org.apache.commons.lang3.SystemUtils;import io.onedev.server.web.editable.annotation.Editable;-@Editable(name="Use git in System Path", order=100)+@Editable(name="Use Git Command Line in System Path", order=100)public class SystemGit extends GitConfig {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 60c00a5cd8..f5d8488443 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -2977,20 +2977,4 @@ public class DataMigrator {}}- private void migrate64(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("SYSTEM")) {- Element valueElement = element.element("value");- if (valueElement != null)- valueElement.addElement("maxGitLFSFileSize").setText("4096");- }- }- dom.writeToFile(file, false);- }- }- }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.javaindex 1c7cb88c3f..9d689f3f3c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java@@ -54,7 +54,7 @@ public class SystemSetting implements Serializable, Validatable {this.gitConfig = gitConfig;}- @Editable(order=250, name="CURL Command Line", description="OneDev configures git hooks to communicate with itself via curl")+ @Editable(order=250, name="curl Command Line", description="OneDev configures git hooks to communicate with itself via curl")@Valid@NotNull(message="may not be empty")public CurlConfig getCurlConfig() {