diff --git a/app/observers/issue_observer.rb b/app/observers/issue_observer.rb index b150e39e239b70503c7e3fa68e2a20a15524fc24..1575cf0f19f26979a92c5bffe07371b882fa28d8 100644 --- a/app/observers/issue_observer.rb +++ b/app/observers/issue_observer.rb @@ -13,6 +13,7 @@ class IssueObserver < BaseObserver def after_reopen(issue, transition) create_note(issue) + execute_hooks(issue) end def after_update(issue) @@ -21,6 +22,7 @@ class IssueObserver < BaseObserver end issue.notice_added_references(issue.project, current_user) + execute_hooks(issue) end protected diff --git a/app/observers/merge_request_observer.rb b/app/observers/merge_request_observer.rb index 96492198111e2fb1148f9dfaf33fbda1356a6d06..0ac555fce7c640b57da32f3dbd90608cbf060cdc 100644 --- a/app/observers/merge_request_observer.rb +++ b/app/observers/merge_request_observer.rb @@ -38,12 +38,14 @@ class MergeRequestObserver < ActivityObserver def after_reopen(merge_request, transition) create_event(merge_request, Event::REOPENED) create_note(merge_request) + execute_hooks(merge_request) end def after_update(merge_request) notification.reassigned_merge_request(merge_request, current_user) if merge_request.is_being_reassigned? merge_request.notice_added_references(merge_request.project, current_user) + execute_hooks(merge_request) end def create_event(record, status) diff --git a/app/views/help/web_hooks.html.haml b/app/views/help/web_hooks.html.haml index 66ab7b75bdad45d33f070f7699a3f830caeb19c3..7bde7fcc3d0aa799f3bf2f487b6368c1e7d17460 100644 --- a/app/views/help/web_hooks.html.haml +++ b/app/views/help/web_hooks.html.haml @@ -61,7 +61,7 @@ %h4.prepend-top-20 Issues events %p.light - Triggered when new issue created or existing issue was closed. + Triggered when new issue created or existing issue was updated/closed/reopened. %br Request body: = highlight_js do @@ -86,7 +86,7 @@ } %h4.prepend-top-20 Merge request events %p.light - Triggered when new merge request created or existing merge request was merged/closed. + Triggered when new merge request created or existing merge request was updated/merged/closed. %br Request body: = highlight_js do