diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-07-15 23:03:04 +0300 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-07-15 23:03:04 +0300 |
commit | 73b03aa8ebdb919a78179e8a1e0b735a73baff2c (patch) | |
tree | eba7cd2854ee14ffe5c21aa40bedadcf26fae9bd /app/services | |
parent | 686381f7e6a7f037350ee0b37dd423eef2f10071 (diff) | |
parent | ef892bc2bfa29046dd58441d8d9afe8b3cde0007 (diff) |
Merge branch 'kradydal/gitlab-ce-create-todos-when-issue-author-assigne-or-mention-himself'
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/todo_service.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb index 6bb0a72d30e..6b48d68cccb 100644 --- a/app/services/todo_service.rb +++ b/app/services/todo_service.rb @@ -194,7 +194,7 @@ class TodoService end def create_assignment_todo(issuable, author) - if issuable.assignee && issuable.assignee != author + if issuable.assignee attributes = attributes_for_todo(issuable.project, issuable, author, Todo::ASSIGNED) create_todos(issuable.assignee, attributes) end @@ -239,7 +239,6 @@ class TodoService def filter_mentioned_users(project, target, author) mentioned_users = target.mentioned_users(author) mentioned_users = reject_users_without_access(mentioned_users, project, target) - mentioned_users.delete(author) mentioned_users.uniq end |