Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2021-01-16 12:10:46 +00:00
parent 39a5262a05
commit 45e0a3af4d
2 changed files with 11 additions and 4 deletions

View File

@ -80,8 +80,9 @@
= storage_counter(project.statistics.storage_size)
%span.float-right.light
%span.monospace= project.full_path + '.git'
.card-footer
= paginate @projects, param_name: 'projects_page', theme: 'gitlab'
- unless @projects.size < Kaminari.config.default_per_page
.card-footer
= paginate @projects, param_name: 'projects_page', theme: 'gitlab'
- shared_projects = @group.shared_projects.sort_by(&:name)
- unless shared_projects.empty?
@ -134,5 +135,6 @@
group: @group,
show_controls: false,
current_user_is_group_owner: current_user_is_group_owner }
.card-footer
= paginate @members, param_name: 'members_page', theme: 'gitlab'
- unless @members.size < Kaminari.config.default_per_page
.card-footer
= paginate @members, param_name: 'members_page', theme: 'gitlab'

View File

@ -0,0 +1,5 @@
---
title: Conditionally show card footer in single group page in admin
merge_request: 51426
author: Yogi (@yo)
type: fixed