summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-03-18 17:10:09 +0000
committerDouwe Maan <douwe@gitlab.com>2016-03-18 17:10:09 +0000
commit5100ad090bb4c93a168e1abec0adf3f3dc97a8bc (patch)
tree4f2ae8e7de49f3ff66bd41cd97b8e576efec7228 /app/controllers
parentba611fdb5d3c34436afa2e5a4a3591cbef7bca97 (diff)
parent02b0c37cabf0456a4c36680fb1313b1107f35f54 (diff)
downloadgitlab-ce-5100ad090bb4c93a168e1abec0adf3f3dc97a8bc.tar.gz
Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master'
Trigger a todo for mentions on commits page Closes #14006 * Screenshot: ![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png) See merge request !3262
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/dashboard/todos_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb
index 7857af9c5de..be488483b09 100644
--- a/app/controllers/dashboard/todos_controller.rb
+++ b/app/controllers/dashboard/todos_controller.rb
@@ -6,7 +6,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
end
def destroy
- todo.done!
+ todo.done
todo_notice = 'Todo was successfully marked as done.'
@@ -20,7 +20,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
end
def destroy_all
- @todos.each(&:done!)
+ @todos.each(&:done)
respond_to do |format|
format.html { redirect_to dashboard_todos_path, notice: 'All todos were marked as done.' }