Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/web_hooks/web_hooks_helper.rb')
-rw-r--r--app/helpers/web_hooks/web_hooks_helper.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/helpers/web_hooks/web_hooks_helper.rb b/app/helpers/web_hooks/web_hooks_helper.rb
index 95122750c2f..e95b90c69ef 100644
--- a/app/helpers/web_hooks/web_hooks_helper.rb
+++ b/app/helpers/web_hooks/web_hooks_helper.rb
@@ -5,6 +5,7 @@ module WebHooks
EXPIRY_TTL = 1.hour
def show_project_hook_failed_callout?(project:)
+ return false if project_hook_page?
return false unless current_user
return false unless Feature.enabled?(:webhooks_failed_callout, project)
return false unless Feature.enabled?(:web_hooks_disable_failed, project)
@@ -23,5 +24,9 @@ module WebHooks
ProjectHook.for_projects(project).disabled.exists?
end
end
+
+ def project_hook_page?
+ current_controller?('projects/hooks') || current_controller?('projects/hook_logs')
+ end
end
end