Merge pull request #14832 from eduardoj/fix/rubocop_lint_shadowed_exc…

…eption

Address Lint/ShadowedException RuboCop offenses

src/api/.rubocop_todo.yml

@@ -129,11 +129,6 @@ Lint/RescueException:
     - 'config/environment.rb'
     - 'lib/tasks/extract.rake'
 
-# Offense count: 1
-Lint/ShadowedException:
-  Exclude:
-    - 'app/models/project/remote_url.rb'
-
 # Offense count: 1
 Lint/StructNewOverride:
   Exclude:

src/api/app/lib/backend/connection.rb

@@ -115,11 +115,9 @@ def self.put_or_post(method, path, data, in_headers)
                             end
         begin
           http.request(backend_request)
-        # rubocop:disable Lint/ShadowedException
-        rescue Errno::EPIPE, Errno::ECONNRESET, SocketError, Errno::EINTR, EOFError, IOError, Errno::ETIMEDOUT
+        rescue Errno::EPIPE, Errno::ECONNRESET, SocketError, Errno::EINTR, IOError, Errno::ETIMEDOUT
           raise Timeout::Error
         end
-        # rubocop:enable Lint/ShadowedException
       end
       Backend::Logger.info(method, host, port, path, response, start_time)
       handle_response(response)

src/api/app/models/project/remote_url.rb

@@ -9,7 +9,7 @@ def self.load(remote_project, path)
     ENV['no_proxy'] = Configuration.first.no_proxy if ENV['no_proxy'].blank?
     begin
       uri.open.read
-    rescue OpenURI::HTTPError, SocketError, Errno::EINTR, Errno::EPIPE, EOFError, Net::HTTPBadResponse, IOError, Errno::ENETUNREACH,
+    rescue OpenURI::HTTPError, SocketError, Errno::EINTR, Errno::EPIPE, Net::HTTPBadResponse, IOError, Errno::ENETUNREACH,
            Errno::EADDRNOTAVAIL, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Timeout::Error, OpenSSL::SSL::SSLError => e
       Rails.logger.info "#{e} when fetching #{path} from #{remote_project.remoteurl}"
       Airbrake.notify(e)