Move Labels and Milestones as sub tab to Issues/MR

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/views/layouts/nav/_project.html.haml

@@ -62,13 +62,6 @@
           %span
             Graphs
 
-    - if project_nav_tab? :milestones
-      = nav_link(controller: :milestones) do
-        = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
-          = navbar_icon('milestones')
-          %span
-            Milestones
-
     - if project_nav_tab? :issues
       = nav_link(controller: :issues) do
         = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do
@@ -86,13 +79,6 @@
             Merge Requests
             %span.badge.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
 
-    - if project_nav_tab? :labels
-      = nav_link(controller: :labels) do
-        = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
-          = icon('tags fw')
-          %span
-            Labels
-
     - if project_nav_tab? :wiki
       = nav_link(controller: :wikis) do
         = link_to get_project_wiki_path(@project), title: 'Wiki', class: 'shortcuts-wiki' do

app/views/projects/issues/_head.html.haml

+%ul.nav-links.sub-nav
+  %div{ class: (container_class) }
+    - if project_nav_tab?(:issues)
+      = nav_link(controller: :issues) do
+        = link_to url_for_project_issues(@project, only_path: true), title: 'Issues' do
+          %span
+            Issues
+
+    - if project_nav_tab?(:merge_requests)
+      = nav_link(controller: :merge_requests) do
+        = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests' do
+          %span
+            Merge Requests
+
+    - if project_nav_tab? :labels
+      = nav_link(controller: :labels) do
+        = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
+          %span
+            Labels
+
+    - if project_nav_tab? :milestones
+      = nav_link(controller: :milestones) do
+        = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
+          %span
+            Milestones

app/views/projects/issues/index.html.haml

+- @no_container = true
 - page_title "Issues"
+= render "projects/issues/head"
 
 = content_for :meta_tags do
   - if current_user
     = auto_discovery_link_tag(:atom, namespace_project_issues_url(@project.namespace, @project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
 
-.top-area
+%div{ class: (container_class) }
+  .top-area
     = render 'shared/issuable/nav', type: :issues
     .nav-controls
       - if current_user
@@ -17,7 +20,7 @@
         = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: @issuable_finder.assignee.try(:id), milestone_id: @issuable_finder.milestones.try(:first).try(:id) }), class: "btn btn-new", title: "New Issue", id: "new_issue_link" do
           New Issue
 
-= render 'shared/issuable/filter', type: :issues
+  = render 'shared/issuable/filter', type: :issues
 
-.issues-holder
+  .issues-holder
     = render "issues"

app/views/projects/labels/index.html.haml

+- @no_container = true
 - page_title "Labels"
 - hide_class = ''
+= render "projects/issues/head"
 
-.top-area
+%div{ class: (container_class) }
+  .top-area
     .nav-text
       Labels can be applied to issues and merge requests.
     .nav-controls
@@ -9,7 +12,7 @@
         = link_to new_namespace_project_label_path(@project.namespace, @project), class: "btn btn-new" do
           New label
 
-.labels
+  .labels
     - if can?(current_user, :admin_label, @project)
       -# Only show it in the first page
       - hide = @project.labels.empty? || (params[:page].present? && params[:page] != '1')

app/views/projects/merge_requests/_head.html.haml

-.top-tabs
-  = link_to namespace_project_merge_requests_path(@project.namespace, @project), class: "tab #{'active' if current_page?(namespace_project_merge_requests_path(@project.namespace, @project)) }" do
-    %span
-    Merge Requests
-

app/views/projects/merge_requests/index.html.haml

+- @no_container = true
 - page_title "Merge Requests"
-
+= render "projects/issues/head"
 = render 'projects/last_push'
 
-.top-area
+%div{ class: (container_class) }
+  .top-area
     = render 'shared/issuable/nav', type: :merge_requests
     .nav-controls
       = render 'shared/issuable/search_form', path: namespace_project_merge_requests_path(@project.namespace, @project)
@@ -12,7 +14,7 @@
         = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "New Merge Request" do
           New Merge Request
 
-= render 'shared/issuable/filter', type: :merge_requests
+  = render 'shared/issuable/filter', type: :merge_requests
 
-.merge-requests-holder
+  .merge-requests-holder
     = render 'merge_requests'

app/views/projects/milestones/index.html.haml

+- @no_container = true
 - page_title "Milestones"
+= render "projects/issues/head"
 
-.top-area
+%div{ class: (container_class) }
+  .top-area
     = render 'shared/milestones_filter'
 
     .nav-controls
@@ -8,7 +11,7 @@
         = link_to new_namespace_project_milestone_path(@project.namespace, @project), class: "btn btn-new", title: "New Milestone" do
           New Milestone
 
-.milestones
+  .milestones
     %ul.content-list
       = render @milestones