Merge branch 'public_profiles' into 'master'

Make all group public

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219#

Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361

See merge request !1247

3 files changed, 51 insertions, 43 deletions

diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 0577f4ec142..a9ba9d2ba10 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,3 +1,6 @@
+- unless can?(current_user, :read_group, @group)
+  - @disable_search_panel = true
+
 = content_for :meta_tags do
   - if current_user
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
@@ -16,22 +19,25 @@
 
   = render 'shared/show_aside'
 
-  .row
-    %section.activities.col-md-7
-      .hidden-xs
-        - if current_user
-          = render "events/event_last_push", event: @last_push
-
+  - if can?(current_user, :read_group, @group)
+    .row
+      %section.activities.col-md-7
+        .hidden-xs
           - if current_user
+            = render "events/event_last_push", event: @last_push
+
             %ul.nav.nav-pills.event_filter.pull-right
               %li
                 = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do
                   %i.fa.fa-rss
 
-          = render 'shared/event_filter'
-          %hr
+            = render 'shared/event_filter'
+            %hr
 
-      .content_list
-      = spinner
-    %aside.side.col-md-5
-      = render "projects", projects: @projects
+        .content_list
+        = spinner
+      %aside.side.col-md-5
+        = render "projects", projects: @projects
+  - else
+    %p
+      This group does not have public projects
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 3892f71c0e3..c31b1cbe9a8 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -7,8 +7,9 @@
 
       .navbar-collapse.collapse
         %ul.nav.navbar-nav.pull-right
-          %li.hidden-sm.hidden-xs
-            = render 'layouts/search'
+          - unless @disable_search_panel
+            %li.hidden-sm.hidden-xs
+              = render 'layouts/search'
           %li.visible-sm.visible-xs
             = link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom'} do
               = icon('search')
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index f57ec7e13f2..eb35af22b93 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -12,34 +12,35 @@
       = icon('dashboard fw')
       %span
         Group
-  - if current_user
-    = nav_link(controller: [:group, :milestones]) do
-      = link_to group_milestones_path(@group), title: 'Milestones', data: {placement: 'right'} do
-        = icon('clock-o fw')
+  - if can?(current_user, :read_group, @group)
+    - if current_user
+      = nav_link(controller: [:group, :milestones]) do
+        = link_to group_milestones_path(@group), title: 'Milestones', data: {placement: 'right'} do
+          = icon('clock-o fw')
+          %span
+            Milestones
+    = nav_link(path: 'groups#issues') do
+      = link_to issues_group_path(@group), title: 'Issues', data: {placement: 'right'} do
+        = icon('exclamation-circle fw')
         %span
-          Milestones
-  = nav_link(path: 'groups#issues') do
-    = link_to issues_group_path(@group), title: 'Issues', data: {placement: 'right'} do
-      = icon('exclamation-circle fw')
-      %span
-        Issues
-        - if current_user
-          %span.count= Issue.opened.of_group(@group).count
-  = nav_link(path: 'groups#merge_requests') do
-    = link_to merge_requests_group_path(@group), title: 'Merge Requests', data: {placement: 'right'} do
-      = icon('tasks fw')
-      %span
-        Merge Requests
-        - if current_user
-          %span.count= MergeRequest.opened.of_group(@group).count
-  = nav_link(controller: [:group_members]) do
-    = link_to group_group_members_path(@group), title: 'Members', data: {placement: 'right'} do
-      = icon('users fw')
-      %span
-        Members
-  - if can?(current_user, :admin_group, @group)
-    = nav_link(html_options: { class: "separate-item" }) do
-      = link_to edit_group_path(@group), title: 'Settings', data: {placement: 'right'} do
-        = icon ('cogs fw')
+          Issues
+          - if current_user
+            %span.count= Issue.opened.of_group(@group).count
+    = nav_link(path: 'groups#merge_requests') do
+      = link_to merge_requests_group_path(@group), title: 'Merge Requests', data: {placement: 'right'} do
+        = icon('tasks fw')
+        %span
+          Merge Requests
+          - if current_user
+            %span.count= MergeRequest.opened.of_group(@group).count
+    = nav_link(controller: [:group_members]) do
+      = link_to group_group_members_path(@group), title: 'Members', data: {placement: 'right'} do
+        = icon('users fw')
         %span
-          Settings
+          Members
+    - if can?(current_user, :admin_group, @group)
+      = nav_link(html_options: { class: "separate-item" }) do
+        = link_to edit_group_path(@group), title: 'Settings', data: {placement: 'right'} do
+          = icon ('cogs fw')
+          %span
+            Settings