diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-19 23:06:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-08-19 23:06:30 +0000 |
| commit | c620c4057593a726044f9dc1a907149831a54c28 (patch) | |
| tree | 8f030f5d009649d174438c2db090d74ab53a6850 /app/controllers/dashboard | |
| parent | d6e027d9ca4aef4f2aaca8b3dc75e337d83c85dd (diff) | |
| parent | 37bf35f0bcba28e271789542fb8c81a6c77236b6 (diff) | |
| download | gitlab-ce-c620c4057593a726044f9dc1a907149831a54c28.tar.gz | |
Merge branch 'issue_18135' into 'master'
Todos sorting dropdown
Implements #18135
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5691
Diffstat (limited to 'app/controllers/dashboard')
| -rw-r--r-- | app/controllers/dashboard/todos_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb index c8390af3b36..d425d0f9014 100644 --- a/app/controllers/dashboard/todos_controller.rb +++ b/app/controllers/dashboard/todos_controller.rb @@ -2,6 +2,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController before_action :find_todos, only: [:index, :destroy_all] def index + @sort = params[:sort] @todos = @todos.page(params[:page]) end |