diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
| commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
| tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /app/controllers/dashboard/projects_controller.rb | |
| parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) | |
| download | gitlab-ce-a7b3560714b4d9cc4ab32dffcd1f74a284b93580.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'app/controllers/dashboard/projects_controller.rb')
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index d861ef646f8..0074bcac360 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -35,7 +35,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController # rubocop: disable CodeReuse/ActiveRecord def starred - @projects = load_projects(params.merge(starred: true)) + @projects = load_projects(params.merge(starred: true, not_aimed_for_deletion: true)) .includes(:forked_from_project, :topics) @groups = [] @@ -54,7 +54,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController private def projects - @projects ||= load_projects(params.merge(non_public: true)) + @projects ||= load_projects(params.merge(non_public: true, not_aimed_for_deletion: true)) end def render_projects @@ -65,8 +65,8 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController end def load_projects(finder_params) - @total_user_projects_count = ProjectsFinder.new(params: { non_public: true, without_deleted: true }, current_user: current_user).execute - @total_starred_projects_count = ProjectsFinder.new(params: { starred: true, without_deleted: true }, current_user: current_user).execute + @total_user_projects_count = ProjectsFinder.new(params: { non_public: true, without_deleted: true, not_aimed_for_deletion: true }, current_user: current_user).execute + @total_starred_projects_count = ProjectsFinder.new(params: { starred: true, without_deleted: true, not_aimed_for_deletion: true }, current_user: current_user).execute finder_params[:use_cte] = true if use_cte_for_finder? finder_params[:without_deleted] = true |