diff options
Diffstat (limited to 'lib/gitlab/http.rb')
| -rw-r--r-- | lib/gitlab/http.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/http.rb b/lib/gitlab/http.rb index 559e1828a70..be87dcc0ff9 100644 --- a/lib/gitlab/http.rb +++ b/lib/gitlab/http.rb @@ -35,7 +35,7 @@ module Gitlab def self.perform_request(http_method, path, options, &block) log_info = options.delete(:extra_log_info) options_with_timeouts = - if !options.has_key?(:timeout) && Feature.enabled?(:http_default_timeouts) + if !options.has_key?(:timeout) options.with_defaults(DEFAULT_TIMEOUT_OPTIONS) else options |