diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-24 21:10:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-24 21:10:19 +0300 |
commit | 9b14160725d91f8824b35223f16bf073a97bf7de (patch) | |
tree | 121f5165f80d2c921b4135566b3c9e620531434d /lib/gitlab/setup_helper.rb | |
parent | 27622f7417713cbd2057a7f642e9ce128d9fc169 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/setup_helper.rb')
-rw-r--r-- | lib/gitlab/setup_helper.rb | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/lib/gitlab/setup_helper.rb b/lib/gitlab/setup_helper.rb index 64a30fbe16c..4df6a50c8dd 100644 --- a/lib/gitlab/setup_helper.rb +++ b/lib/gitlab/setup_helper.rb @@ -28,6 +28,25 @@ module Gitlab end # rubocop:enable Rails/Output + module Workhorse + extend Gitlab::SetupHelper + class << self + def configuration_toml(dir, _) + config = { redis: { URL: redis_url } } + + TomlRB.dump(config) + end + + def redis_url + Gitlab::Redis::SharedState.url + end + + def get_config_path(dir) + File.join(dir, 'config.toml') + end + end + end + module Gitaly extend Gitlab::SetupHelper class << self |