diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-01-19 20:39:44 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-01-19 20:39:44 +0300 |
| commit | c84272dc9a5c2d9619347f91b4e316431dada975 (patch) | |
| tree | 4508b74d69835e979654a6933bcb17fdbc8c5cb9 /config | |
| parent | 639b880e702f35819439c234dbda3168787f29fd (diff) | |
| parent | 0a1c8bb37cbfe550e7c29b8f30c607cf985466df (diff) | |
Merge branch 'feature/gitaly-feature-flag' into 'master'
Gitaly feature flag
See merge request !8440
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? |