summaryrefslogtreecommitdiff
path: root/app/controllers/dashboard
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-08-07 12:35:32 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-08-07 12:35:32 +0000
commitb3deca7a2606a6b2cef464ed08417be4ffb0cb6b (patch)
tree58cb99a58196581520303a57e9f2024553649eae /app/controllers/dashboard
parent411070c3afa621a0bdc741617c1d17f54205b81a (diff)
parent6dc7490789237a84b66baaaf4c6deea5ec3bf2de (diff)
downloadgitlab-ce-b3deca7a2606a6b2cef464ed08417be4ffb0cb6b.tar.gz
Merge branch 'group-todos' into 'master'
Group todos See merge request gitlab-org/gitlab-ce!20675
Diffstat (limited to 'app/controllers/dashboard')
-rw-r--r--app/controllers/dashboard/todos_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb
index f9e8fe624e8..bd7111e28bc 100644
--- a/app/controllers/dashboard/todos_controller.rb
+++ b/app/controllers/dashboard/todos_controller.rb
@@ -70,7 +70,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
end
def todo_params
- params.permit(:action_id, :author_id, :project_id, :type, :sort, :state)
+ params.permit(:action_id, :author_id, :project_id, :type, :sort, :state, :group_id)
end
def redirect_out_of_range(todos)