summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-06-27 17:49:29 +0000
committerRobert Speicher <rspeicher@gmail.com>2016-06-28 16:48:16 -0400
commit4778df1ce25b18d88e587e16c72e8f14488b8b88 (patch)
tree66d4ff0ced6c467f26dac2a56ae1da2bd8ba0a84
parent53452ef5da05c90d464c314e6e4c5905697fc0ca (diff)
downloadgitlab-ce-4778df1ce25b18d88e587e16c72e8f14488b8b88.tar.gz
Merge branch 'mark-done-todo-id' into 'master'
Correctly return todo ID after creating todo See merge request !4941 (cherry picked from commit 21842cf90f0d2545ed3d687ce864eb0d551b7059)
-rw-r--r--app/services/todo_service.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb
index 540bf54b920..239bd17a035 100644
--- a/app/services/todo_service.rb
+++ b/app/services/todo_service.rb
@@ -159,8 +159,9 @@ class TodoService
def create_todos(users, attributes)
Array(users).map do |user|
next if pending_todos(user, attributes).exists?
- Todo.create(attributes.merge(user_id: user.id))
+ todo = Todo.create(attributes.merge(user_id: user.id))
user.update_todos_count_cache
+ todo
end
end