From 4ee8bd11fa317a99dc0f99ea8d33271e4c9d1a47 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Thu, 15 Nov 2018 16:55:51 +0100 Subject: [PATCH] Backport ServiceHook#execute from EE In EE this method takes an additional argument that specifies the name of the hook to trigger. There is no particular reason to not backport this to CE, since by default the behaviour remains the same. By backporting this code we remove the need for prepending ServiceHook with a module in EE. --- app/models/hooks/service_hook.rb | 4 ++-- 1 file 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