Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' into 'master'

Fixes 500 error caused by pending delete projects in admin dashboard

Closes #35453

See merge request !13067

app/controllers/admin/dashboard_controller.rb

@@ -1,6 +1,6 @@
 class Admin::DashboardController < Admin::ApplicationController
   def index
-    @projects = Project.with_route.limit(10)
+    @projects = Project.without_deleted.with_route.limit(10)
     @users = User.limit(10)
     @groups = Group.with_route.limit(10)
   end

changelogs/unreleased/35453-pending-delete-projects-error-in-admin-dashboard-fix.yml

@@ -0,0 +1,4 @@
+---
+title: Fixes 500 error caused by pending delete projects in admin dashboard
+merge_request: 13067
+author:

spec/controllers/admin/dashboard_controller_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Admin::DashboardController do
+  describe '#index' do
+    context 'with pending_delete projects' do
+      render_views
+
+      it 'does not retrieve projects that are pending deletion' do
+        sign_in(create(:admin))
+
+        project = create(:project)
+        pending_delete_project = create(:project, pending_delete: true)
+
+        get :index
+
+        expect(response.body).to match(project.name)
+        expect(response.body).not_to match(pending_delete_project.name)
+      end
+    end
+  end
+end