diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2016-12-26 19:15:40 +0200 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-01-18 19:43:17 +0200 |
| commit | 0a1c8bb37cbfe550e7c29b8f30c607cf985466df (patch) | |
| tree | 7686e1296ed4935bb8fc79e809411fd44aaa6bc9 /config | |
| parent | 4b43126d08972c201551fbd1fe42e85847d5e03f (diff) | |
| download | gitlab-ce-0a1c8bb37cbfe550e7c29b8f30c607cf985466df.tar.gz | |
Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flag
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index ee97b4e42b9..906ec11f012 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -404,6 +404,12 @@ Settings.rack_attack.git_basic_auth['findtime'] ||= 1.minute Settings.rack_attack.git_basic_auth['bantime'] ||= 1.hour # +# Gitaly +# +Settings['gitaly'] ||= Settingslogic.new({}) +Settings.gitaly['socket_path'] ||= ENV['GITALY_SOCKET_PATH'] + +# # Testing settings # if Rails.env.test? |