Commit 33feaa04285e8c6fbc2d9f7278d21d0ca62382d1
Exists in
master
and in
4 other branches
Merge pull request #5881 from gendoc/master
More issues and merge request events support in Project web hooks
Showing
3 changed files
with
6 additions
and
2 deletions
Show diff stats
app/observers/issue_observer.rb
... | ... | @@ -13,6 +13,7 @@ class IssueObserver < BaseObserver |
13 | 13 | |
14 | 14 | def after_reopen(issue, transition) |
15 | 15 | create_note(issue) |
16 | + execute_hooks(issue) | |
16 | 17 | end |
17 | 18 | |
18 | 19 | def after_update(issue) |
... | ... | @@ -21,6 +22,7 @@ class IssueObserver < BaseObserver |
21 | 22 | end |
22 | 23 | |
23 | 24 | issue.notice_added_references(issue.project, current_user) |
25 | + execute_hooks(issue) | |
24 | 26 | end |
25 | 27 | |
26 | 28 | protected | ... | ... |
app/observers/merge_request_observer.rb
... | ... | @@ -38,12 +38,14 @@ class MergeRequestObserver < ActivityObserver |
38 | 38 | def after_reopen(merge_request, transition) |
39 | 39 | create_event(merge_request, Event::REOPENED) |
40 | 40 | create_note(merge_request) |
41 | + execute_hooks(merge_request) | |
41 | 42 | end |
42 | 43 | |
43 | 44 | def after_update(merge_request) |
44 | 45 | notification.reassigned_merge_request(merge_request, current_user) if merge_request.is_being_reassigned? |
45 | 46 | |
46 | 47 | merge_request.notice_added_references(merge_request.project, current_user) |
48 | + execute_hooks(merge_request) | |
47 | 49 | end |
48 | 50 | |
49 | 51 | def create_event(record, status) | ... | ... |
app/views/help/web_hooks.html.haml
... | ... | @@ -61,7 +61,7 @@ |
61 | 61 | |
62 | 62 | %h4.prepend-top-20 Issues events |
63 | 63 | %p.light |
64 | - Triggered when new issue created or existing issue was closed. | |
64 | + Triggered when new issue created or existing issue was updated/closed/reopened. | |
65 | 65 | %br |
66 | 66 | Request body: |
67 | 67 | = highlight_js do |
... | ... | @@ -86,7 +86,7 @@ |
86 | 86 | } |
87 | 87 | %h4.prepend-top-20 Merge request events |
88 | 88 | %p.light |
89 | - Triggered when new merge request created or existing merge request was merged/closed. | |
89 | + Triggered when new merge request created or existing merge request was updated/merged/closed. | |
90 | 90 | %br |
91 | 91 | Request body: |
92 | 92 | = highlight_js do | ... | ... |