diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-18 17:26:52 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-20 12:12:05 -0200 |
| commit | 424cb9ccaef35717bd934dd48f8bd69515210a50 (patch) | |
| tree | d47f9277c01d25779ace645a72e8ddc2559b0e28 | |
| parent | 72009896758dfcf73f94146b67e7758190ce7039 (diff) | |
| download | gitlab-ce-424cb9ccaef35717bd934dd48f8bd69515210a50.tar.gz | |
:lipstick: Cosmetic changes
| -rw-r--r-- | app/services/task_service.rb | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/app/services/task_service.rb b/app/services/task_service.rb index 48678763f31..cdd025eadc5 100644 --- a/app/services/task_service.rb +++ b/app/services/task_service.rb @@ -89,18 +89,18 @@ class TaskService # def new_note(note) # Skip system notes, like status changes and cross-references - unless note.system - project = note.project - target = note.noteable - author = note.author + return if note.system - mark_pending_tasks_as_done(target, author) + project = note.project + target = note.noteable + author = note.author - mentioned_users = build_mentioned_users(project, note, author) + mark_pending_tasks_as_done(target, author) - mentioned_users.each do |user| - create_task(project, target, author, user, Task::MENTIONED, note) - end + mentioned_users = build_mentioned_users(project, note, author) + + mentioned_users.each do |user| + create_task(project, target, author, user, Task::MENTIONED, note) end end @@ -111,19 +111,19 @@ class TaskService # def update_note(note, current_user) # Skip system notes, like status changes and cross-references - unless note.system - project = note.project - target = note.noteable - author = current_user + return if note.system - mark_pending_tasks_as_done(target, author) + project = note.project + target = note.noteable + author = current_user + + mark_pending_tasks_as_done(target, author) - mentioned_users = build_mentioned_users(project, note, author) + mentioned_users = build_mentioned_users(project, note, author) - mentioned_users.each do |user| - unless pending_tasks(mentioned_user, project, target, note: note, action: Task::MENTIONED).exists? - create_task(project, target, author, user, Task::MENTIONED, note) - end + mentioned_users.each do |user| + unless pending_tasks(mentioned_user, project, target, note: note, action: Task::MENTIONED).exists? + create_task(project, target, author, user, Task::MENTIONED, note) end end end @@ -159,10 +159,10 @@ class TaskService end def pending_tasks(user, project, target, options = {}) - options.reverse_merge({ + options.reverse_merge( project: project, target: target - }) + ) user.tasks.pending.where(options) end |