Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental

# Conflicts:
#	Gemfile.lock
#	app/helpers/todos_helper.rb
#	app/models/todo.rb
#	app/views/projects/edit.html.haml
#	lib/gitlab/import_export/import_service.rb

1 files changed, 42 insertions, 60 deletions

diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index d429a928464..885e78d38c6 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -1,63 +1,45 @@
-%ul.nav.nav-sidebar
-  = nav_link do
-    = link_to project_path(@project), title: 'Go to project', class: 'back-link' do
-      = icon('caret-square-o-left fw')
+- if project_nav_tab? :team
+  = nav_link(controller: [:project_members, :teams]) do
+    = link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: 'team-tab tab' do
       %span
-        Go to project
+        Members
 
-  %li.separate-item
-
-  %ul.sidebar-subnav
-    = nav_link(path: 'projects#edit') do
-      = link_to edit_project_path(@project), title: 'Project Settings' do
-        = icon('pencil-square-o fw')
-        %span
-          Project Settings
-    - if @project.allowed_to_share_with_group?
-      = nav_link(controller: :group_links) do
-        = link_to namespace_project_group_links_path(@project.namespace, @project), title: "Groups" do
-          = icon('share-square-o fw')
-          %span
-            Groups
-    = nav_link(controller: :deploy_keys) do
-      = link_to namespace_project_deploy_keys_path(@project.namespace, @project), title: 'Deploy Keys' do
-        = icon('key fw')
-        %span
-          Deploy Keys
-    = nav_link(controller: :hooks) do
-      = link_to namespace_project_hooks_path(@project.namespace, @project), title: 'Webhooks' do
-        = icon('link fw')
-        %span
-          Webhooks
-    = nav_link(controller: :services) do
-      = link_to namespace_project_services_path(@project.namespace, @project), title: 'Services' do
-        = icon('cogs fw')
-        %span
-          Services
-    = nav_link(controller: :protected_branches) do
-      = link_to namespace_project_protected_branches_path(@project.namespace, @project), title: 'Protected Branches' do
-        = icon('lock fw')
-        %span
-          Protected Branches
+- if @project.allowed_to_share_with_group?
+  = nav_link(controller: :group_links) do
+    = link_to namespace_project_group_links_path(@project.namespace, @project), title: "Groups" do
+      %span
+        Groups
+= nav_link(controller: :deploy_keys) do
+  = link_to namespace_project_deploy_keys_path(@project.namespace, @project), title: 'Deploy Keys' do
+    %span
+      Deploy Keys
+= nav_link(controller: :hooks) do
+  = link_to namespace_project_hooks_path(@project.namespace, @project), title: 'Webhooks' do
+    %span
+      Webhooks
+= nav_link(controller: :services) do
+  = link_to namespace_project_services_path(@project.namespace, @project), title: 'Services' do
+    %span
+      Services
+= nav_link(controller: :protected_branches) do
+  = link_to namespace_project_protected_branches_path(@project.namespace, @project), title: 'Protected Branches' do
+    %span
+      Protected Branches
 
-    - if @project.builds_enabled?
-      = nav_link(controller: :runners) do
-        = link_to namespace_project_runners_path(@project.namespace, @project), title: 'Runners' do
-          = icon('cog fw')
-          %span
-            Runners
-      = nav_link(controller: :variables) do
-        = link_to namespace_project_variables_path(@project.namespace, @project), title: 'Variables' do
-          = icon('code fw')
-          %span
-            Variables
-      = nav_link(controller: :triggers) do
-        = link_to namespace_project_triggers_path(@project.namespace, @project), title: 'Triggers' do
-          = icon('retweet fw')
-          %span
-            Triggers
-      = nav_link(controller: :badges) do
-        = link_to namespace_project_badges_path(@project.namespace, @project), title: 'Badges' do
-          = icon('star-half-empty fw')
-          %span
-            Badges
+- if @project.builds_enabled?
+  = nav_link(controller: :runners) do
+    = link_to namespace_project_runners_path(@project.namespace, @project), title: 'Runners' do
+      %span
+        Runners
+  = nav_link(controller: :variables) do
+    = link_to namespace_project_variables_path(@project.namespace, @project), title: 'Variables' do
+      %span
+        Variables
+  = nav_link(controller: :triggers) do
+    = link_to namespace_project_triggers_path(@project.namespace, @project), title: 'Triggers' do
+      %span
+        Triggers
+  = nav_link(controller: :badges) do
+    = link_to namespace_project_badges_path(@project.namespace, @project), title: 'Badges' do
+      %span
+        Badges