1 files changed, 10 insertions, 0 deletions
diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb
index 57a9538db15..e6ee4355fd4 100644
--- a/app/finders/projects_finder.rb
+++ b/app/finders/projects_finder.rb
@@ -53,6 +53,10 @@ class ProjectsFinder < UnionFinder
         init_collection
       end
 
+    if Feature.enabled?(:hide_projects_of_banned_users)
+      collection = without_created_and_owned_by_banned_user(collection)
+    end
+
     use_cte = params.delete(:use_cte)
     collection = Project.wrap_with_cte(collection) if use_cte
     collection = filter_projects(collection)
@@ -282,6 +286,12 @@ class ProjectsFinder < UnionFinder
 
     { min_access_level: params[:min_access_level] }
   end
+
+  def without_created_and_owned_by_banned_user(projects)
+    return projects if current_user&.can?(:admin_all_resources)
+
+    projects.without_created_and_owned_by_banned_user
+  end
 end
 
 ProjectsFinder.prepend_mod_with('ProjectsFinder')