Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 1 insertions, 9 deletions

diff --git a/app/helpers/web_hooks/web_hooks_helper.rb b/app/helpers/web_hooks/web_hooks_helper.rb
index bda9bf58fb7..514db6ba8a2 100644
--- a/app/helpers/web_hooks/web_hooks_helper.rb
+++ b/app/helpers/web_hooks/web_hooks_helper.rb
@@ -2,8 +2,6 @@
 
 module WebHooks
   module WebHooksHelper
-    EXPIRY_TTL = 1.hour
-
     def show_project_hook_failed_callout?(project:)
       return false if project_hook_page?
       return false unless current_user
@@ -12,17 +10,11 @@ module WebHooks
       # Assumes include of Users::CalloutsHelper
       return false if web_hook_disabled_dismissed?(project)
 
-      any_project_hook_failed?(project) # Most expensive query last
+      project.fetch_web_hook_failure
     end
 
     private
 
-    def any_project_hook_failed?(project)
-      Rails.cache.fetch("any_web_hook_failed:#{project.id}", expires_in: EXPIRY_TTL) do
-        ProjectHook.for_projects(project).disabled.exists?
-      end
-    end
-
     def project_hook_page?
       current_controller?('projects/hooks') || current_controller?('projects/hook_logs')
     end