diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
| commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
| tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/controllers/dashboard | |
| parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/controllers/dashboard')
| -rw-r--r-- | app/controllers/dashboard/snippets_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/dashboard/todos_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/dashboard/snippets_controller.rb b/app/controllers/dashboard/snippets_controller.rb index 01dc0b1ab00..5a885349467 100644 --- a/app/controllers/dashboard/snippets_controller.rb +++ b/app/controllers/dashboard/snippets_controller.rb @@ -19,6 +19,7 @@ class Dashboard::SnippetsController < Dashboard::ApplicationController .page(params[:page]) .inc_author .inc_projects_namespace_route + .inc_statistics return if redirect_out_of_range(@snippets) diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb index 0ae326b5d94..782c8c293fd 100644 --- a/app/controllers/dashboard/todos_controller.rb +++ b/app/controllers/dashboard/todos_controller.rb @@ -52,7 +52,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController end def bulk_restore - TodoService.new.restore_todos(current_user.todos.for_ids(params[:ids]), current_user) + TodoService.new.restore_todos(current_user.todos.id_in(params[:ids]), current_user) render json: todos_counts end |