Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/gitlab/health_checks/probes/collection.rb b/lib/gitlab/health_checks/probes/collection.rb
index b34e4273d85..76ad1c84214 100644
--- a/lib/gitlab/health_checks/probes/collection.rb
+++ b/lib/gitlab/health_checks/probes/collection.rb
@@ -20,7 +20,7 @@ module Gitlab
             success ? 200 : 503,
             status(success).merge(payload(readiness))
           )
-        rescue => e
+        rescue StandardError => e
           exception_payload = { message: "#{e.class} : #{e.message}" }
 
           Probes::Status.new(
diff --git a/lib/gitlab/health_checks/simple_abstract_check.rb b/lib/gitlab/health_checks/simple_abstract_check.rb
index ae99768b7b4..432d5d5e5ea 100644
--- a/lib/gitlab/health_checks/simple_abstract_check.rb
+++ b/lib/gitlab/health_checks/simple_abstract_check.rb
@@ -16,7 +16,7 @@ module Gitlab
         else
           HealthChecks::Result.new(name, false, "unexpected #{human_name} check result: #{check_result}")
         end
-      rescue => e
+      rescue StandardError => e
         HealthChecks::Result.new(name, false, "unexpected #{human_name} check result: #{e}")
       end