Commit e11d499a authored by charlie ablett's avatar charlie ablett

Merge branch 'andysoiron/cleanup-header_read_timeout_buffered_io-feature-flag' into 'master'

Remove header_read_timeout_buffered_io feature flag

See merge request gitlab-org/gitlab!83729
parents eefceac5 8cda0d07
---
name: header_read_timeout_buffered_io
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78065
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350233
milestone: '14.8'
type: development
group: group::integrations
default_enabled: true
...@@ -29,17 +29,13 @@ module Gitlab ...@@ -29,17 +29,13 @@ module Gitlab
http = super http = super
http.hostname_override = hostname if hostname http.hostname_override = hostname if hostname
if Feature.enabled?(:header_read_timeout_buffered_io, default_enabled: :yaml)
gitlab_http = Gitlab::NetHttpAdapter.new(http.address, http.port) gitlab_http = Gitlab::NetHttpAdapter.new(http.address, http.port)
http.instance_variables.each do |variable| http.instance_variables.each do |variable|
gitlab_http.instance_variable_set(variable, http.instance_variable_get(variable)) gitlab_http.instance_variable_set(variable, http.instance_variable_get(variable))
end end
return gitlab_http gitlab_http
end
http
end end
private private
......
...@@ -27,16 +27,6 @@ RSpec.describe Gitlab::HTTPConnectionAdapter do ...@@ -27,16 +27,6 @@ RSpec.describe Gitlab::HTTPConnectionAdapter do
end end
end end
context 'with header_read_timeout_buffered_io feature disabled' do
before do
stub_feature_flags(header_read_timeout_buffered_io: false)
end
it 'uses the regular Net::HTTP class' do
expect(connection).to be_a(Net::HTTP)
end
end
context 'when local requests are allowed' do context 'when local requests are allowed' do
let(:options) { { allow_local_requests: true } } let(:options) { { allow_local_requests: true } }
......
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