Commit 40363f4b authored by Matthias Kaeppler's avatar Matthias Kaeppler

Drop http_default_timeouts feature flag

parent 91950c18
---
title: Stricter default timeouts for outgoing HTTP requests
merge_request: 39188
author:
type: other
......@@ -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
......
......@@ -157,17 +157,6 @@ RSpec.describe Gitlab::HTTP do
described_class.put('http://example.org', write_timeout: 1)
end
end
context 'when default timeouts feature is disabled' do
it 'does not apply any defaults' do
stub_feature_flags(http_default_timeouts: false)
expect(described_class).to receive(:httparty_perform_request).with(
Net::HTTP::Get, 'http://example.org', open_timeout: 1
).and_call_original
described_class.get('http://example.org', open_timeout: 1)
end
end
end
describe '.try_get' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment