kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge pull request #5881 from gendoc/master

Browse source 
More issues and merge request events support in Project web hooks
This commit is contained in:
Dmitriy Zaporozhets 2013-12-19 08:56:09 -08:00
commit 33feaa0428
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/observers/issue_observer.rb
View file

@ -13,6 +13,7 @@ class IssueObserver < BaseObserver
def after_reopen(issue, transition) def after_reopen(issue, transition)
create_note(issue) create_note(issue)
execute_hooks(issue)
end end
def after_update(issue) def after_update(issue)
@ -21,6 +22,7 @@ class IssueObserver < BaseObserver
end end
issue.notice_added_references(issue.project, current_user) issue.notice_added_references(issue.project, current_user)
execute_hooks(issue)
end end
protected protected

2
app/observers/merge_request_observer.rb
View file

@ -38,12 +38,14 @@ class MergeRequestObserver < ActivityObserver
def after_reopen(merge_request, transition) def after_reopen(merge_request, transition)
create_event(merge_request, Event::REOPENED) create_event(merge_request, Event::REOPENED)
create_note(merge_request) create_note(merge_request)
execute_hooks(merge_request)
end end
def after_update(merge_request) def after_update(merge_request)
notification.reassigned_merge_request(merge_request, current_user) if merge_request.is_being_reassigned? notification.reassigned_merge_request(merge_request, current_user) if merge_request.is_being_reassigned?
merge_request.notice_added_references(merge_request.project, current_user) merge_request.notice_added_references(merge_request.project, current_user)
execute_hooks(merge_request)
end end
def create_event(record, status) def create_event(record, status)

4
app/views/help/web_hooks.html.haml
View file

@ -61,7 +61,7 @@
%h4.prepend-top-20 Issues events %h4.prepend-top-20 Issues events
%p.light %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 %br
Request body: Request body:
= highlight_js do = highlight_js do
@ -86,7 +86,7 @@
} }
%h4.prepend-top-20 Merge request events %h4.prepend-top-20 Merge request events
%p.light %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 %br
Request body: Request body:
= highlight_js do = highlight_js do