diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /lib/gitlab/http.rb | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
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 |