diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
| commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
| tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /app/models/hooks/web_hook.rb | |
| parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) | |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'app/models/hooks/web_hook.rb')
| -rw-r--r-- | app/models/hooks/web_hook.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb index 3320c13e87b..7e538238cbd 100644 --- a/app/models/hooks/web_hook.rb +++ b/app/models/hooks/web_hook.rb @@ -50,8 +50,9 @@ class WebHook < ApplicationRecord end # rubocop: disable CodeReuse/ServiceClass - def execute(data, hook_name) - WebHookService.new(self, data, hook_name).execute if executable? + def execute(data, hook_name, force: false) + # hook.executable? is checked in WebHookService#execute + WebHookService.new(self, data, hook_name, force: force).execute end # rubocop: enable CodeReuse/ServiceClass |