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

Merge branch '17671-private-forks-list-ui-issues' into 'master'
63d411d7 · Robert Speicher · ae63172d · b36d84b3 · 63d411d7 · 63d411d7
Commit 63d411d7 authored Jun 21, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

index.html.haml app/views/projects/forks/index.html.haml +0 -6

_list.html.haml app/views/shared/projects/_list.html.haml +6 -0

No files found.
--- 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.
--- 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