summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-06-29 01:11:45 +0000
committerDouwe Maan <douwe@gitlab.com>2017-06-29 01:11:45 +0000
commitc89f7c71f69e575bb2e45746917decbbf9118203 (patch)
tree306f192360a6cde07bdc6795beeaa5f1f7e8c171 /app/views
parentb07c00032b038f40796a28e34b6dd4c622bad012 (diff)
parent1fbb7f977777de7c8808429693359c7a98ffdfcc (diff)
downloadgitlab-ce-c89f7c71f69e575bb2e45746917decbbf9118203.tar.gz
Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'
refactors Project#search namespace join Closes #30708 See merge request !12091
Diffstat (limited to 'app/views')
-rw-r--r--app/views/shared/projects/_list.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml
index aaffc0927eb..7ed6c622558 100644
--- a/app/views/shared/projects/_list.html.haml
+++ b/app/views/shared/projects/_list.html.haml
@@ -13,7 +13,7 @@
- if projects.any?
%ul.projects-list
- projects.each_with_index do |project, i|
- - css_class = (i >= projects_limit) ? 'hide' : nil
+ - css_class = (i >= projects_limit) || project.pending_delete? ? 'hide' : nil
= render "shared/projects/project", project: project, skip_namespace: skip_namespace,
avatar: avatar, stars: stars, css_class: css_class, ci: ci, use_creator_avatar: use_creator_avatar,
forks: forks, show_last_commit_as_description: show_last_commit_as_description