Merge branch 'fix-gitlab-foss-build' into 'master'

Fix gitlab foss build Closes #210022 See merge request gitlab-org/gitlab!26985

Merge branch 'fix-gitlab-foss-build' into 'master'
Fix gitlab foss build Closes #210022 See merge request gitlab-org/gitlab!26985
ceaa6b76 · Rémy Coutable · e6868abd · bb8fbddd · ceaa6b76 · e6868abd
Commit ceaa6b76 authored Mar 11, 2020 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config/gitlab.yml.example config/gitlab.yml.example +1 -1

tmp/tests/.gitkeep tmp/tests/.gitkeep +0 -0

No files found.
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -1227,7 +1227,7 @@ test:
    client_path: tmp/tests/gitaly
    token: secret
  workhorse:
-    secret_file: tmp/tests/gitlab_workhorse_secret
+    secret_file: tmp/gitlab_workhorse_test_secret
  backup:
    path: tmp/tests/backups
  pseudonymizer:

--- a/tmp/tests/.gitkeep
+++ b/tmp/tests/.gitkeep