diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-11-16 09:59:44 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-11-16 09:59:44 +0000 |
| commit | 8d0b4872ba3ff787c4067618f48b60bd24466c74 (patch) | |
| tree | c461ed5658862ca9abf4fba9b842247690d7d3de | |
| parent | 71fffc86b010655cc27ab15a22904fd5be92dcfe (diff) | |
| parent | 4ee8bd11fa317a99dc0f99ea8d33271e4c9d1a47 (diff) | |
| download | gitlab-ce-8d0b4872ba3ff787c4067618f48b60bd24466c74.tar.gz | |
Merge branch 'backport-service-hook-execute-arguments' into 'master'
Backport ServiceHook#execute from EE
See merge request gitlab-org/gitlab-ce!23122
| -rw-r--r-- | app/models/hooks/service_hook.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/hooks/service_hook.rb b/app/models/hooks/service_hook.rb index 7d9f6d89d44..8f305dd7c22 100644 --- a/app/models/hooks/service_hook.rb +++ b/app/models/hooks/service_hook.rb @@ -5,8 +5,8 @@ class ServiceHook < WebHook validates :service, presence: true # rubocop: disable CodeReuse/ServiceClass - def execute(data) - WebHookService.new(self, data, 'service_hook').execute + def execute(data, hook_name = 'service_hook') + WebHookService.new(self, data, hook_name).execute end # rubocop: enable CodeReuse/ServiceClass end |