summaryrefslogtreecommitdiff
path: root/app/observers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-24 14:18:32 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-24 14:18:32 +0200
commit48f741eed9f3676a8d0d089d7336fcffd31ebaa7 (patch)
tree4a1e24e29f0a4c90fc10f274f4e900c0064bcd20 /app/observers
parentd1d138562a347ec78f0331d5242e28fbb368bad0 (diff)
downloadgitlab-ce-48f741eed9f3676a8d0d089d7336fcffd31ebaa7.tar.gz
MergeRequests services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/observers')
-rw-r--r--app/observers/merge_request_observer.rb17
1 files changed, 0 insertions, 17 deletions
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)