diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /app/helpers/web_hooks/web_hooks_helper.rb | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'app/helpers/web_hooks/web_hooks_helper.rb')
-rw-r--r-- | app/helpers/web_hooks/web_hooks_helper.rb | 5 |
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 |