Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 8 deletions

diff --git a/lib/gitlab/http_connection_adapter.rb b/lib/gitlab/http_connection_adapter.rb
index 002708beb3c..7b1657d3854 100644
--- a/lib/gitlab/http_connection_adapter.rb
+++ b/lib/gitlab/http_connection_adapter.rb
@@ -29,17 +29,13 @@ module Gitlab
       http = super
       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|
-          gitlab_http.instance_variable_set(variable, http.instance_variable_get(variable))
-        end
-
-        return gitlab_http
+      http.instance_variables.each do |variable|
+        gitlab_http.instance_variable_set(variable, http.instance_variable_get(variable))
       end
 
-      http
+      gitlab_http
     end
 
     private