diff options
author | bugagazavr <kirik910@gmail.com> | 2015-01-24 03:10:43 +0300 |
---|---|---|
committer | Kirill Zaitsev <kirik910@gmail.com> | 2015-04-25 21:31:52 +0300 |
commit | 548f182814acd0f7a110e6c165c186e345901b00 (patch) | |
tree | 26bb991cb343dd48c81f1004016817e634ee5039 /app/services | |
parent | 5cb325b50188fb2ba6483e710a29350c4b0b06ae (diff) | |
download | gitlab-ce-548f182814acd0f7a110e6c165c186e345901b00.tar.gz |
Added X-GitLab-Event header for web hooks
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/system_hooks_service.rb | 6 | ||||
-rw-r--r-- | app/services/test_hook_service.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/services/system_hooks_service.rb b/app/services/system_hooks_service.rb index c5d0b08845b..60235b6be2a 100644 --- a/app/services/system_hooks_service.rb +++ b/app/services/system_hooks_service.rb @@ -7,12 +7,12 @@ class SystemHooksService def execute_hooks(data) SystemHook.all.each do |sh| - async_execute_hook sh, data + async_execute_hook(sh, data, 'system_hooks') end end - def async_execute_hook(hook, data) - Sidekiq::Client.enqueue(SystemHookWorker, hook.id, data) + def async_execute_hook(hook, data, hook_name) + Sidekiq::Client.enqueue(SystemHookWorker, hook.id, data, hook_name) end def build_event_data(model, event) diff --git a/app/services/test_hook_service.rb b/app/services/test_hook_service.rb index 21ec2c01cb8..e85e58751e7 100644 --- a/app/services/test_hook_service.rb +++ b/app/services/test_hook_service.rb @@ -1,6 +1,6 @@ class TestHookService def execute(hook, current_user) data = Gitlab::PushDataBuilder.build_sample(hook.project, current_user) - hook.execute(data) + hook.execute(data, 'push_hooks') end end |