summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-06-20 17:42:54 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-06-20 17:42:54 +0200
commit218da88e1aa7b0538d069ce9dc6e3a4348c610fc (patch)
treeac31025caa313fd3218afaa50b76cf3c690f4aa9 /lib
parent4f8af50b619dd87c16035f56dce5cbde3531aef1 (diff)
downloadgitlab-ce-218da88e1aa7b0538d069ce9dc6e3a4348c610fc.tar.gz
Enable gitaly token auth when testing
Diffstat (limited to 'lib')
-rw-r--r--lib/tasks/gitlab/gitaly.rake5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index e88111c3725..a8db5701d0b 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -58,8 +58,9 @@ namespace :gitlab do
storages << { name: key, path: val['path'] }
end
-
- TOML.dump(socket_path: address.sub(%r{\Aunix:}, ''), storage: storages)
+ config = { socket_path: address.sub(%r{\Aunix:}, ''), storage: storages }
+ config[:auth] = { token: 'secret' } if Rails.env.test?
+ TOML.dump(config)
end
def create_gitaly_configuration