Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app.go
diff options
context:
space:
mode:
authorVladimir Shushlin <vshushlin@gitlab.com>2022-06-03 08:59:43 +0300
committerVladimir Shushlin <vshushlin@gitlab.com>2022-06-03 08:59:43 +0300
commit3c89945269c643b8b3b55d1d967c19922101c48c (patch)
treed1cfb384da58e72ca3f21aa3a7df7cda71eebc18 /app.go
parent2fe03721dbc6abb0240a284186a4bc4f4545d008 (diff)
parente281682390728361887e13f482428ae922e848b3 (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.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/app.go b/app.go
index 760a8bfb..c7797297 100644
--- a/app.go
+++ b/app.go
@@ -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