diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 15:14:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 15:14:09 +0000 |
| commit | d4e0452ed946ca0cf4dd0537675abeda7a4c0ffa (patch) | |
| tree | 1f719aa86ade289adefa247ba93a8f0f90528608 /app/controllers | |
| parent | cd17aa65132de074aab9ae50ab7bbf7f16428546 (diff) | |
| download | gitlab-ce-d4e0452ed946ca0cf4dd0537675abeda7a4c0ffa.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/explore/projects_controller.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index 645b3eb9eb5..e26ac083622 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -66,8 +66,8 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController end def load_projects(finder_params) - @total_user_projects_count = ProjectsFinder.new(params: { non_public: true, archived: false, not_aimed_for_deletion: true }, current_user: current_user).execute - @total_starred_projects_count = ProjectsFinder.new(params: { starred: true, archived: false, not_aimed_for_deletion: true }, current_user: current_user).execute + @all_user_projects = ProjectsFinder.new(params: { non_public: true, archived: false, not_aimed_for_deletion: true }, current_user: current_user).execute + @all_starred_projects = ProjectsFinder.new(params: { starred: true, archived: false, not_aimed_for_deletion: true }, current_user: current_user).execute finder_params[:use_cte] = true if use_cte_for_finder? diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb index 34745815f3d..eebcbe88ebf 100644 --- a/app/controllers/explore/projects_controller.rb +++ b/app/controllers/explore/projects_controller.rb @@ -88,8 +88,8 @@ class Explore::ProjectsController < Explore::ApplicationController private def load_project_counts - @total_user_projects_count = ProjectsFinder.new(params: { non_public: true }, current_user: current_user).execute - @total_starred_projects_count = ProjectsFinder.new(params: { starred: true }, current_user: current_user).execute + @all_user_projects = ProjectsFinder.new(params: { non_public: true }, current_user: current_user).execute + @all_starred_projects = ProjectsFinder.new(params: { starred: true }, current_user: current_user).execute end def load_projects |