diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-16 15:10:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-16 15:10:46 +0300 |
| commit | 45e0a3af4d48c93ae297aa6f452955aa546e9eb7 (patch) | |
| tree | f6d0d61ae797b6081ebcfa52cb450699da18e359 | |
| parent | 39a5262a05794d1e83b3927c2f6813c1174688c2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | app/views/admin/groups/show.html.haml | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/yo-remove-footer-members-list.yml | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 386df99717b..b949d08718a 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -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' diff --git a/changelogs/unreleased/yo-remove-footer-members-list.yml b/changelogs/unreleased/yo-remove-footer-members-list.yml new file mode 100644 index 00000000000..c0bc317a9af --- /dev/null +++ b/changelogs/unreleased/yo-remove-footer-members-list.yml @@ -0,0 +1,5 @@ +--- +title: Conditionally show card footer in single group page in admin +merge_request: 51426 +author: Yogi (@yo) +type: fixed |