diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-09 03:09:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-09 03:09:24 +0000 |
| commit | a25cab22f84ee674ebb32625a6da566acd454e8a (patch) | |
| tree | f52667dd7f61cace3157fd55c1485cc2becbe3e3 /workhorse/main.go | |
| parent | 77914793a349059bf523b131fc925b34349d6884 (diff) | |
| download | gitlab-ce-a25cab22f84ee674ebb32625a6da566acd454e8a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/main.go')
| -rw-r--r-- | workhorse/main.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/workhorse/main.go b/workhorse/main.go index e50bb6c9634..47ab63a875a 100644 --- a/workhorse/main.go +++ b/workhorse/main.go @@ -143,6 +143,7 @@ func buildConfig(arg0 string, args []string) (*bootConfig, *config.Config, error cfg.Redis = cfgFromFile.Redis cfg.ObjectStorageCredentials = cfgFromFile.ObjectStorageCredentials cfg.ImageResizerConfig = cfgFromFile.ImageResizerConfig + cfg.AltDocumentRoot = cfgFromFile.AltDocumentRoot return boot, cfg, nil } |