diff options
author | Vladimir Shushlin <vshushlin@gitlab.com> | 2022-06-03 08:59:43 +0300 |
---|---|---|
committer | Vladimir Shushlin <vshushlin@gitlab.com> | 2022-06-03 08:59:43 +0300 |
commit | 3c89945269c643b8b3b55d1d967c19922101c48c (patch) | |
tree | d1cfb384da58e72ca3f21aa3a7df7cda71eebc18 /app.go | |
parent | 2fe03721dbc6abb0240a284186a4bc4f4545d008 (diff) | |
parent | e281682390728361887e13f482428ae922e848b3 (diff) |
Merge branch 'feat/infer-artifact-server' into 'master'
feat: infer artifacts-server from internal server unless it's set explicitly
Closes #747
See merge request gitlab-org/gitlab-pages!775
Diffstat (limited to 'app.go')
-rw-r--r-- | app.go | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -362,9 +362,7 @@ func runApp(config *cfg.Config) error { return fmt.Errorf("failed to initialize logging: %w", err) } - if config.ArtifactsServer.URL != "" { - a.Artifact = artifact.New(config.ArtifactsServer.URL, config.ArtifactsServer.TimeoutSeconds, config.General.Domain) - } + a.Artifact = artifact.New(config.ArtifactsServer.URL, config.ArtifactsServer.TimeoutSeconds, config.General.Domain) if err := a.setAuth(config); err != nil { return err |