summaryrefslogtreecommitdiff
path: root/app/services/system_hooks_service.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-18 11:37:16 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-18 11:37:16 +0000
commit8e9c073a146f655cea2fd13f259bd68dc2c37259 (patch)
tree01bd2ec14fd6406b1deb1947935b36463a7e4529 /app/services/system_hooks_service.rb
parentd617c24f59f9cc1c068301ec755caa2de6cd6b73 (diff)
parent6ef1b94ccf9eb60d5cff43d7e1302129d1b43cc3 (diff)
downloadgitlab-ce-8e9c073a146f655cea2fd13f259bd68dc2c37259.tar.gz
Merge branch 'feature/merge-request-system-hook' into 'master'
System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
Diffstat (limited to 'app/services/system_hooks_service.rb')
-rw-r--r--app/services/system_hooks_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/system_hooks_service.rb b/app/services/system_hooks_service.rb
index af6d77ef5e8..a6b7a6e1416 100644
--- a/app/services/system_hooks_service.rb
+++ b/app/services/system_hooks_service.rb
@@ -8,7 +8,7 @@ class SystemHooksService
end
def execute_hooks(data, hooks_scope = :all)
- SystemHook.public_send(hooks_scope).find_each do |hook| # rubocop:disable GitlabSecurity/PublicSend
+ SystemHook.hooks_for(hooks_scope).find_each do |hook|
hook.async_execute(data, 'system_hooks')
end
end