diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-09-04 22:38:18 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-09-04 22:38:18 +0900 |
| commit | 209549c95fb0d4ba3196cc8ed888f7c024216ebb (patch) | |
| tree | 6a025de948e9bed18784db06b57b80341ddbebc7 | |
| parent | 5b88bd81f52b454c80c54bef9951bdb8cf607238 (diff) | |
| download | gitlab-ce-209549c95fb0d4ba3196cc8ed888f7c024216ebb.tar.gz | |
Revert iunnecessary change(gitaly)
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 72065811528..9a5f4f598b2 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -23,8 +23,7 @@ module Gitlab klass = Gitaly.const_get(name.to_s.camelcase.to_sym).const_get(:Stub) addr = address(storage) addr = addr.sub(%r{^tcp://}, '') if URI(addr).scheme == 'tcp' - timeout = 10 if Rails.env.test? - klass.new(addr, :this_channel_is_insecure, timeout: timeout) + klass.new(addr, :this_channel_is_insecure) end end end |