summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-10-15 13:10:42 +0000
committerSteve Azzopardi <steveazz@outlook.com>2018-10-16 13:43:53 +0200
commitc52bc477dcfc46fe85b39c9b76fb269c200176cd (patch)
tree9f77b89d2cfb74137443f2e8323996ed30f2420e /app/views
parenta05d39a2c3c2a928cbed13416c9ffbfe3b545dcc (diff)
downloadgitlab-ce-c52bc477dcfc46fe85b39c9b76fb269c200176cd.tar.gz
Merge branch '52564-personal-projects-pagination-in-profile-overview-tab-is-broken' into 'master'
Resolve "Personal projects pagination in Profile Overview tab is broken" Closes #52564 See merge request gitlab-org/gitlab-ce!22321
Diffstat (limited to 'app/views')
-rw-r--r--app/views/shared/projects/_list.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml
index e1da05d8f08..06eb3d03e31 100644
--- a/app/views/shared/projects/_list.html.haml
+++ b/app/views/shared/projects/_list.html.haml
@@ -8,6 +8,7 @@
- user = local_assigns[:user]
- show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true
- remote = false unless local_assigns[:remote] == true
+- skip_pagination = false unless local_assigns[:skip_pagination] == true
.js-projects-list-holder
- if any_projects?(projects)
@@ -25,6 +26,6 @@
= icon('lock fw', base: 'circle', class: 'fa-lg private-fork-icon')
%strong= pluralize(@private_forks_count, 'private fork')
%span &nbsp;you have no access to.
- = paginate_collection(projects, remote: remote)
+ = paginate_collection(projects, remote: remote) unless skip_pagination
- else
.nothing-here-block No projects found