From 48f741eed9f3676a8d0d089d7336fcffd31ebaa7 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 24 Jan 2014 14:18:32 +0200 Subject: MergeRequests services Signed-off-by: Dmitriy Zaporozhets --- app/observers/merge_request_observer.rb | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'app/observers') diff --git a/app/observers/merge_request_observer.rb b/app/observers/merge_request_observer.rb index 0ac555fce7c..ef31498e7d0 100644 --- a/app/observers/merge_request_observer.rb +++ b/app/observers/merge_request_observer.rb @@ -18,23 +18,6 @@ class MergeRequestObserver < ActivityObserver execute_hooks(merge_request) end - def after_merge(merge_request, transition) - notification.merge_mr(merge_request) - # Since MR can be merged via sidekiq - # to prevent event duplication do this check - return true if merge_request.merge_event - - Event.create( - project: merge_request.target_project, - target_id: merge_request.id, - target_type: merge_request.class.name, - action: Event::MERGED, - author_id: merge_request.author_id_of_changes - ) - - execute_hooks(merge_request) - end - def after_reopen(merge_request, transition) create_event(merge_request, Event::REOPENED) create_note(merge_request) -- cgit v1.2.1