summaryrefslogtreecommitdiffstats
path: root/modules/setting
diff options
context:
space:
mode:
authorkolaente <k@knt.li>2020-10-11 22:27:20 +0200
committerGitHub <noreply@github.com>2020-10-11 21:27:20 +0100
commit64133126cdb842a047b2cd104c2f177f6e83f79a (patch)
tree8bfd86c1f7a3c565c19552c588758674384796e3 /modules/setting
parente35f7e81ae7ed8388a8011baa43cb4faf42ebfe0 (diff)
downloadgitea-64133126cdb842a047b2cd104c2f177f6e83f79a.tar.gz
gitea-64133126cdb842a047b2cd104c2f177f6e83f79a.zip
Update golangci-lint to version 1.31.0 (#13102)
This PR updates golangci-lint to the latest version 1.31.0. The upgrade introduced a new check for which I've fixed or disabled most cases. Signed-off-by: kolaente <k@knt.li>
Diffstat (limited to 'modules/setting')
-rw-r--r--modules/setting/repository.go2
-rw-r--r--modules/setting/setting.go6
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/setting/repository.go b/modules/setting/repository.go
index 96159e2f4a..0bb10199a8 100644
--- a/modules/setting/repository.go
+++ b/modules/setting/repository.go
@@ -253,7 +253,7 @@ func newRepository() {
if err != nil {
log.Fatal("Failed to get home directory: %v", err)
}
- homeDir = strings.Replace(homeDir, "\\", "/", -1)
+ homeDir = strings.ReplaceAll(homeDir, "\\", "/")
// Determine and create root git repository path.
sec := Cfg.Section("repository")
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 8088cffcdf..69f0080f64 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -405,7 +405,7 @@ func getAppPath() (string, error) {
}
// Note: we don't use path.Dir here because it does not handle case
// which path starts with two "/" in Windows: "//psf/Home/..."
- return strings.Replace(appPath, "\\", "/", -1), err
+ return strings.ReplaceAll(appPath, "\\", "/"), err
}
func getWorkPath(appPath string) string {
@@ -422,7 +422,7 @@ func getWorkPath(appPath string) string {
workPath = appPath[:i]
}
}
- return strings.Replace(workPath, "\\", "/", -1)
+ return strings.ReplaceAll(workPath, "\\", "/")
}
func init() {
@@ -524,7 +524,7 @@ func NewContext() {
if err != nil {
log.Fatal("Failed to get home directory: %v", err)
}
- homeDir = strings.Replace(homeDir, "\\", "/", -1)
+ homeDir = strings.ReplaceAll(homeDir, "\\", "/")
LogLevel = getLogLevel(Cfg.Section("log"), "LEVEL", "Info")
StacktraceLogLevel = getStacktraceLogLevel(Cfg.Section("log"), "STACKTRACE_LEVEL", "None")