Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 12 deletions

diff --git a/lib/gitlab/http.rb b/lib/gitlab/http.rb
index 7bb16e071b0..567c4dc899f 100644
--- a/lib/gitlab/http.rb
+++ b/lib/gitlab/http.rb
@@ -44,29 +44,19 @@ module Gitlab
           options
         end
 
-      options[:skip_read_total_timeout] = true if options[:skip_read_total_timeout].nil? && options[:stream_body]
-
-      if options[:skip_read_total_timeout]
+      if options[:stream_body]
         return httparty_perform_request(http_method, path, options_with_timeouts, &block)
       end
 
       start_time = nil
       read_total_timeout = options.fetch(:timeout, DEFAULT_READ_TOTAL_TIMEOUT)
-      tracked_timeout_error = false
 
       httparty_perform_request(http_method, path, options_with_timeouts) do |fragment|
         start_time ||= Gitlab::Metrics::System.monotonic_time
         elapsed = Gitlab::Metrics::System.monotonic_time - start_time
 
         if elapsed > read_total_timeout
-          error = ReadTotalTimeout.new("Request timed out after #{elapsed} seconds")
-
-          raise error if options[:use_read_total_timeout]
-
-          unless tracked_timeout_error
-            Gitlab::ErrorTracking.track_exception(error)
-            tracked_timeout_error = true
-          end
+          raise ReadTotalTimeout, "Request timed out after #{elapsed} seconds"
         end
 
         block.call fragment if block