Merge branch '22826-ui-inconsistency-different-files-views-find-file-button-missing' into 'master'

app/assets/stylesheets/pages/tree.scss

@@ -160,7 +160,6 @@
 
 .tree-controls {
   float: right;
-  margin-top: 11px;
   position: relative;
   z-index: 2;
 

app/views/projects/tree/_tree_header.html.haml

+.tree-controls
+  = render 'projects/find_file_link'
+  = render 'projects/buttons/download', project: @project, ref: @ref
+
 .tree-ref-holder
   = render 'shared/ref_switcher', destination: 'tree', path: @path
 

app/views/projects/tree/show.html.haml

@@ -7,12 +7,4 @@
 = render 'projects/last_push'
 
 %div{ class: container_class }
-  .tree-controls
-    = render 'projects/find_file_link'
-    = render 'projects/buttons/download', project: @project, ref: @ref
-
-  #tree-holder.tree-holder.clearfix
-    .nav-block
-      = render 'projects/tree/tree_header', tree: @tree
-
-    = render 'projects/tree/tree_content', tree: @tree
+  = render 'projects/files'

changelogs/unreleased/22826-ui-inconsistency-different-files-views-find-file-button-missing.yml

+---
+title: Fix UI inconsistency different files view (find file button missing)
+merge_request: 9847
+author: TM Lee

spec/features/projects/files/find_files_spec.rb

+require 'spec_helper'
+
+feature 'Find files button in the tree header', feature: true do
+  given(:user) { create(:user) }
+  given(:project) { create(:project) }
+
+  background do
+    login_as(user)
+    project.team << [user, :developer]
+  end
+
+  scenario 'project main screen' do
+    visit namespace_project_path(
+      project.namespace,
+      project
+    )
+
+    expect(page).to have_selector('.tree-controls .shortcuts-find-file')
+  end
+
+  scenario 'project tree screen' do
+    visit namespace_project_tree_path(
+      project.namespace,
+      project,
+      project.default_branch
+    )
+
+    expect(page).to have_selector('.tree-controls .shortcuts-find-file')
+  end
+end