kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/groups/show.html.haml
View file

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

5
changelogs/unreleased/yo-remove-footer-members-list.yml Normal file
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