Commit 8d0b4872 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'backport-service-hook-execute-arguments' into 'master'

Backport ServiceHook#execute from EE

See merge request gitlab-org/gitlab-ce!23122
parents 71fffc86 4ee8bd11
...@@ -5,8 +5,8 @@ class ServiceHook < WebHook ...@@ -5,8 +5,8 @@ class ServiceHook < WebHook
validates :service, presence: true validates :service, presence: true
# rubocop: disable CodeReuse/ServiceClass # rubocop: disable CodeReuse/ServiceClass
def execute(data) def execute(data, hook_name = 'service_hook')
WebHookService.new(self, data, 'service_hook').execute WebHookService.new(self, data, hook_name).execute
end end
# rubocop: enable CodeReuse/ServiceClass # rubocop: enable CodeReuse/ServiceClass
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment