Download as
Browse Code »

Commit 33feaa04285e8c6fbc2d9f7278d21d0ca62382d1

Authored by Dmitriy Zaporozhets
2 parents dc4b7cb4 392d79db
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
  Diff comments   View file @33feaa0
@@ -13,6 +13,7 @@ class IssueObserver < BaseObserver @@ -13,6 +13,7 @@ class IssueObserver < BaseObserver
13 13
14 def after_reopen(issue, transition) 14 def after_reopen(issue, transition)
15 create_note(issue) 15 create_note(issue)
  16 + execute_hooks(issue)
16 end 17 end
17 18
18 def after_update(issue) 19 def after_update(issue)
@@ -21,6 +22,7 @@ class IssueObserver < BaseObserver @@ -21,6 +22,7 @@ class IssueObserver < BaseObserver
21 end 22 end
22 23
23 issue.notice_added_references(issue.project, current_user) 24 issue.notice_added_references(issue.project, current_user)
  25 + execute_hooks(issue)
24 end 26 end
25 27
26 protected 28 protected
app/observers/merge_request_observer.rb
  Diff comments   View file @33feaa0
@@ -38,12 +38,14 @@ class MergeRequestObserver < ActivityObserver @@ -38,12 +38,14 @@ class MergeRequestObserver < ActivityObserver
38 def after_reopen(merge_request, transition) 38 def after_reopen(merge_request, transition)
39 create_event(merge_request, Event::REOPENED) 39 create_event(merge_request, Event::REOPENED)
40 create_note(merge_request) 40 create_note(merge_request)
  41 + execute_hooks(merge_request)
41 end 42 end
42 43
43 def after_update(merge_request) 44 def after_update(merge_request)
44 notification.reassigned_merge_request(merge_request, current_user) if merge_request.is_being_reassigned? 45 notification.reassigned_merge_request(merge_request, current_user) if merge_request.is_being_reassigned?
45 46
46 merge_request.notice_added_references(merge_request.project, current_user) 47 merge_request.notice_added_references(merge_request.project, current_user)
  48 + execute_hooks(merge_request)
47 end 49 end
48 50
49 def create_event(record, status) 51 def create_event(record, status)
app/views/help/web_hooks.html.haml
  Diff comments   View file @33feaa0
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 61
62 %h4.prepend-top-20 Issues events 62 %h4.prepend-top-20 Issues events
63 %p.light 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 %br 65 %br
66 Request body: 66 Request body:
67 = highlight_js do 67 = highlight_js do
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 } 86 }
87 %h4.prepend-top-20 Merge request events 87 %h4.prepend-top-20 Merge request events
88 %p.light 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 %br 90 %br
91 Request body: 91 Request body:
92 = highlight_js do 92 = highlight_js do