Merge branch 'fix_search_in_file_tree' into 'master'

Fix search in Files

https://gitlab.com/gitlab-org/gitlab-ce/issues/1873

See merge request !1511

CHANGELOG

@@ -39,6 +39,7 @@ v 8.0.4
   - Fix anchors to comments in diffs
   - Remove CI token from build traces
   - Fix "Assign All" button on Runner admin page
+  - Fix search in Files
 
 v 8.0.3
   - Fix URL shown in Slack notifications

app/assets/javascripts/tree.js.coffee

@@ -16,6 +16,9 @@ class @TreeView
     li = $("tr.tree-item")
     liSelected = null
     $('body').keydown (e) ->
+      if $("input:focus").length > 0 && (e.which == 38 || e.which == 40)
+        return false
+
       if e.which is 40
         if liSelected
           next = liSelected.next()
@@ -38,4 +41,4 @@ class @TreeView
         $(liSelected).focus()
       else if e.which is 13
         path = $('.tree-item.selected .tree-item-file-name a').attr('href')
-        Turbolinks.visit(path)
+        if path then Turbolinks.visit(path)