summaryrefslogtreecommitdiff
path: root/app/models/hooks
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-09-13 17:17:34 +0200
committerAlexis Reigel <alexis.reigel.ext@siemens.com>2018-01-04 09:33:41 +0100
commit9f7811e474a3f3f54f4624d19ec982239518ed67 (patch)
tree68d387303a19d21787f056b63218b81800366e9d /app/models/hooks
parentfb583c4b1839af16c50e27105a300695aa50bcad (diff)
downloadgitlab-ce-9f7811e474a3f3f54f4624d19ec982239518ed67.tar.gz
execute system hooks from project
Diffstat (limited to 'app/models/hooks')
-rw-r--r--app/models/hooks/system_hook.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/hooks/system_hook.rb b/app/models/hooks/system_hook.rb
index 180c479c41b..78b053f36c3 100644
--- a/app/models/hooks/system_hook.rb
+++ b/app/models/hooks/system_hook.rb
@@ -2,7 +2,8 @@ class SystemHook < WebHook
TRIGGERS = {
repository_update_hooks: :repository_update_events,
push_hooks: :push_events,
- tag_push_hooks: :tag_push_events
+ tag_push_hooks: :tag_push_events,
+ merge_request_hooks: :merge_requests_events
}.freeze
TRIGGERS.each do |trigger, event|
@@ -11,4 +12,5 @@ class SystemHook < WebHook
default_value_for :push_events, false
default_value_for :repository_update_events, true
+ default_value_for :merge_requests_events, false
end