1 files changed, 11 insertions, 72 deletions
diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml
index 858418ff8df..853e2a6e7ec 100644
--- a/app/views/projects/tree/_tree_header.html.haml
+++ b/app/views/projects/tree/_tree_header.html.haml
@@ -1,81 +1,20 @@
 .tree-ref-container
   .tree-ref-holder
     = render 'shared/ref_switcher', destination: 'tree', path: @path
+    - if show_new_repo?
+      .tree-ref-target-holder.js-tree-ref-target-holder
+        = icon('long-arrow-right', title: 'to target branch')
+        = render 'shared/target_switcher', destination: 'tree', path: @path
 
-  %ul.breadcrumb.repo-breadcrumb
-    %li
-      = link_to project_tree_path(@project, @ref) do
-        = @project.path
-    - path_breadcrumbs do |title, path|
-      %li
-        = link_to truncate(title, length: 40), project_tree_path(@project, tree_join(@ref, path))
-
-    - if current_user
-      %li
-        - if !on_top_of_branch?
-          %span.btn.add-to-tree.disabled.has-tooltip{ title: _("You can only add files when you are on a branch"), data: { container: 'body' } }
-            = icon('plus')
-        - else
-          %span.dropdown
-            %a.dropdown-toggle.btn.add-to-tree{ href: '#', "data-toggle" => "dropdown", "data-target" => ".add-to-tree-dropdown" }
-              = icon('plus')
-          .add-to-tree-dropdown
-            %ul.dropdown-menu
-              - if can_edit_tree?
-                %li
-                  = link_to project_new_blob_path(@project, @id) do
-                    = icon('pencil fw')
-                    #{ _('New file') }
-                %li
-                  = link_to '#modal-upload-blob', { 'data-target' => '#modal-upload-blob', 'data-toggle' => 'modal' } do
-                    = icon('file fw')
-                    #{ _('Upload file') }
-                %li
-                  = link_to '#modal-create-new-dir', { 'data-target' => '#modal-create-new-dir', 'data-toggle' => 'modal' } do
-                    = icon('folder fw')
-                    #{ _('New directory') }
-              - elsif can?(current_user, :fork_project, @project)
-                %li
-                  - continue_params = { to:         project_new_blob_path(@project, @id),
-                                        notice:     edit_in_new_fork_notice,
-                                        notice_now: edit_in_new_fork_notice_now }
-                  - fork_path = project_forks_path(@project, namespace_key:  current_user.namespace.id,
-                                                                                          continue:       continue_params)
-                  = link_to fork_path, method: :post do
-                    = icon('pencil fw')
-                    #{ _('New file') }
-                %li
-                  - continue_params = { to:         request.fullpath,
-                                        notice:     edit_in_new_fork_notice + " Try to upload a file again.",
-                                        notice_now: edit_in_new_fork_notice_now }
-                  - fork_path = project_forks_path(@project, namespace_key:  current_user.namespace.id,
-                                                                                          continue:       continue_params)
-                  = link_to fork_path, method: :post do
-                    = icon('file fw')
-                    #{ _('Upload file') }
-                %li
-                  - continue_params = { to:         request.fullpath,
-                                        notice:     edit_in_new_fork_notice + " Try to create a new directory again.",
-                                        notice_now: edit_in_new_fork_notice_now }
-                  - fork_path = project_forks_path(@project, namespace_key:  current_user.namespace.id,
-                                                                                          continue:       continue_params)
-                  = link_to fork_path, method: :post do
-                    = icon('folder fw')
-                    #{ _('New directory') }
-
-              %li.divider
-              %li
-                = link_to new_project_branch_path(@project) do
-                  = icon('code-fork fw')
-                  #{ _('New branch') }
-              %li
-                = link_to new_project_tag_path(@project) do
-                  = icon('tags fw')
-                  #{ _('New tag') }
+  - unless show_new_repo?
+    = render 'projects/tree/old_tree_header'
 
 .tree-controls
-  = render 'projects/find_file_link'
+  - if show_new_repo?
+    = render 'shared/repo/editable_mode'
+  - else
+    = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn'
 
-  = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn'
+  = render 'projects/find_file_link'
 
   = render 'projects/buttons/download', project: @project, ref: @ref