diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-03 00:13:19 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-03 00:13:19 +0000 |
| commit | 1fa7671f44291f78131c0fa31f6d1ffcb3ff6bbc (patch) | |
| tree | 046701638803deb21c1d9242ea98138e6344bb9b /app/views/shared/projects | |
| parent | 89270f77ed1ee5d74bba39edbbd5757d43af2a78 (diff) | |
| parent | d4981e9b4a9a548725eedff98b93c7ff3596c437 (diff) | |
| download | gitlab-ce-1fa7671f44291f78131c0fa31f6d1ffcb3ff6bbc.tar.gz | |
Merge branch 'improve-user-tabs' into 'master'
Add routes and actions for dynamic tab loading. Closes #13588 and #13584
See merge request !2961
Diffstat (limited to 'app/views/shared/projects')
| -rw-r--r-- | app/views/shared/projects/_list.html.haml | 3 |
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 2446e6c30ae..e4bc9998163 100644 --- a/app/views/shared/projects/_list.html.haml +++ b/app/views/shared/projects/_list.html.haml @@ -6,6 +6,7 @@ - ci = false unless local_assigns[:ci] == true - skip_namespace = false unless local_assigns[:skip_namespace] == true - show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true +- remote = false unless local_assigns[:remote] == true %ul.projects-list.content-list - if projects.any? @@ -21,7 +22,7 @@ #{projects_limit} of #{pluralize(projects.count, 'project')} displayed. = link_to '#', class: 'js-expand' do Show all - = paginate projects, theme: "gitlab" if projects.respond_to? :total_pages + = paginate(projects, remote: remote, theme: "gitlab") if projects.respond_to? :total_pages - else .nothing-here-block No projects found |