diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-16 17:49:53 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-16 17:49:53 -0500 |
| commit | e07c27fee427195d8d89f6278d0fc12dfeec3588 (patch) | |
| tree | c4676e5e953aecef8bf2bb715619027cd556c9cc /app/services/todo_service.rb | |
| parent | 029b7d2e9266246feff2f165a10b16be1d7fe88e (diff) | |
| parent | 415159c28da1aec00bb383d46aad67a9de75faae (diff) | |
| download | gitlab-ce-e07c27fee427195d8d89f6278d0fc12dfeec3588.tar.gz | |
Merge branch 'master' into 4273-slash-commands
# Conflicts:
# app/services/issues/create_service.rb
Diffstat (limited to 'app/services/todo_service.rb')
| -rw-r--r-- | app/services/todo_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb index db1578d1dc4..fea5c1fb747 100644 --- a/app/services/todo_service.rb +++ b/app/services/todo_service.rb @@ -144,8 +144,9 @@ class TodoService def mark_todos_as_done(todos, current_user) todos = current_user.todos.where(id: todos.map(&:id)) unless todos.respond_to?(:update_all) - todos.update_all(state: :done) + marked_todos = todos.update_all(state: :done) current_user.update_todos_count_cache + marked_todos end # When user marks an issue as todo |