diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-19 02:53:22 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-20 17:12:05 +0300 |
commit | ce78813c2abb8e65739a0a95d8044e3dca1bfbe6 (patch) | |
tree | bd11d916e50120c2f048783fa352bcfa352d4a5b /app/services | |
parent | a57bf9bd39816cebec5da3da35a1aabbf7462069 (diff) |
Create or mark task pending as soon the action happens
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/merge_requests/post_merge_service.rb | 1 | ||||
-rw-r--r-- | app/services/notes/create_service.rb | 1 | ||||
-rw-r--r-- | app/services/notes/post_process_service.rb | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/app/services/merge_requests/post_merge_service.rb b/app/services/merge_requests/post_merge_service.rb index 63c2f1f4249..8f25c5e2496 100644 --- a/app/services/merge_requests/post_merge_service.rb +++ b/app/services/merge_requests/post_merge_service.rb @@ -11,7 +11,6 @@ module MergeRequests create_merge_event(merge_request, current_user) create_note(merge_request) notification_service.merge_mr(merge_request, current_user) - task_service.merge_merge_request(merge_request, current_user) execute_hooks(merge_request, 'merge') end diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index 8d9661167b5..dbbf9e63164 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -8,6 +8,7 @@ module Notes if note.save # Finish the harder work in the background NewNoteWorker.perform_in(2.seconds, note.id, params) + TaskService.new.new_note(note, current_user) end note diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb index 465b246cabc..e818f58d13c 100644 --- a/app/services/notes/post_process_service.rb +++ b/app/services/notes/post_process_service.rb @@ -13,8 +13,6 @@ module Notes @note.create_cross_references! execute_note_hooks end - - TaskService.new.new_note(note) end def hook_data |