diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-21 18:45:14 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-21 14:46:51 -0400 |
| commit | 7b0466e09138d391187fbb4297e4f04ababc315a (patch) | |
| tree | 9118d4c9f518c2ccf127601da7706775e5f18981 | |
| parent | ef54aa69a3c4245d1d420c5ce3a95da1393d70b5 (diff) | |
| download | gitlab-ce-7b0466e09138d391187fbb4297e4f04ababc315a.tar.gz | |
Merge branch '17671-private-forks-list-ui-issues' into 'master'
Fixed private forks notice position in forks list
Moves the private forks notification item into the list on the forks page.
Closes #17671.
See merge request !4573
| -rw-r--r-- | app/views/projects/forks/index.html.haml | 6 | ||||
| -rw-r--r-- | app/views/shared/projects/_list.html.haml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml index 4bcf2d9d533..dbe9ddfde2f 100644 --- a/app/views/projects/forks/index.html.haml +++ b/app/views/projects/forks/index.html.haml @@ -40,9 +40,3 @@ = render 'projects', projects: @forks - -- if @private_forks_count > 0 - .private-forks-notice - = icon('lock fw', base: 'circle', class: 'fa-lg private-fork-icon') - %strong= pluralize(@private_forks_count, 'private fork') - %span you have no access to. diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml index 2e08bb2ac08..3a9dd37dc7d 100644 --- a/app/views/shared/projects/_list.html.haml +++ b/app/views/shared/projects/_list.html.haml @@ -16,6 +16,12 @@ = render "shared/projects/project", project: project, skip_namespace: skip_namespace, avatar: avatar, stars: stars, css_class: css_class, ci: ci, use_creator_avatar: use_creator_avatar, forks: forks, show_last_commit_as_description: show_last_commit_as_description + + - if @private_forks_count && @private_forks_count > 0 + %li.project-row.private-forks-notice + = icon('lock fw', base: 'circle', class: 'fa-lg private-fork-icon') + %strong= pluralize(@private_forks_count, 'private fork') + %span you have no access to. = paginate(projects, remote: remote, theme: "gitlab") if projects.respond_to? :total_pages - else .nothing-here-block No projects found |