summaryrefslogtreecommitdiff
path: root/workhorse/main.go
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-09 12:08:25 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-09 12:08:25 +0000
commit48d25238c386a89e8a6af218eeb290936a8f7595 (patch)
tree68943880d54468655d103dd6ef0aafbba246c532 /workhorse/main.go
parent5f2a8d5813e1123f06fa7b43d404ea524d9215fc (diff)
downloadgitlab-ce-48d25238c386a89e8a6af218eeb290936a8f7595.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/main.go')
-rw-r--r--workhorse/main.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/workhorse/main.go b/workhorse/main.go
index 054714fce6a..91008e16961 100644
--- a/workhorse/main.go
+++ b/workhorse/main.go
@@ -4,7 +4,6 @@ import (
"context"
"flag"
"fmt"
- "io/ioutil"
"net"
"net/http"
_ "net/http/pprof"
@@ -137,7 +136,7 @@ func buildConfig(arg0 string, args []string) (*bootConfig, *config.Config, error
tomlData := ""
if *configFile != "" {
- buf, err := ioutil.ReadFile(*configFile)
+ buf, err := os.ReadFile(*configFile)
if err != nil {
return nil, nil, fmt.Errorf("configFile: %v", err)
}