Merge branch 'es_search_through_filenames1' into 'master'

Search through the filenames



See merge request !409

CHANGELOG-EE

@@ -14,6 +14,7 @@ v 8.8.0
   - [Elastic] Improve code search
   - [Elastic] Fix encoding issues during indexing
   - Warn admin if current active count exceeds license
+  - [Elastic] Search through the filenames
   - Set KRB5 as default clone protocol when Kerberos is enabled and user is logged in (Borja Aparicio)
   - Add support for Admin Groups to SAML
   - Reduce emails-on-push HTML size by using a simple monospace font

Gemfile

@@ -102,7 +102,7 @@ gem "seed-fu", '~> 2.3.5'
 # Search
 gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
-gem 'gitlab-elasticsearch-git', '~> 0.0.14', require: "elasticsearch/git"
+gem 'gitlab-elasticsearch-git', '~> 0.0.15', require: "elasticsearch/git"
 
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 1.11.0'

Gemfile.lock

@@ -352,7 +352,7 @@ GEM
       mime-types (>= 1.19)
       rugged (>= 0.24.0b13)
     github-markup (1.3.3)
-    gitlab-elasticsearch-git (0.0.14)
+    gitlab-elasticsearch-git (0.0.15)
       activemodel (~> 4.2)
       activesupport (~> 4.2)
       charlock_holmes (~> 0.7)
@@ -965,7 +965,7 @@ DEPENDENCIES
   gemnasium-gitlab-service (~> 0.2)
   github-linguist (~> 4.7.0)
   github-markup (~> 1.3.1)
-  gitlab-elasticsearch-git (~> 0.0.14)
+  gitlab-elasticsearch-git (~> 0.0.15)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-license (~> 0.0.4)
   gitlab_emoji (~> 0.3.0)

app/models/repository.rb

@@ -1000,11 +1000,13 @@ class Repository
     content = result["_source"]["blob"]["content"]
     total_lines = content.lines.size
 
-    term = result["highlight"]["blob.content"][0].match(/gitlabelasticsearch→(.*?)←gitlabelasticsearch/)[1]
+    highlighted_content = result["highlight"]["blob.content"]
+    term = highlighted_content && highlighted_content[0].match(/gitlabelasticsearch→(.*?)←gitlabelasticsearch/)[1]
+
     found_line_number = 0
 
     content.each_line.each_with_index do |line, index|
-      if line.include?(term)
+      if term && line.include?(term)
         found_line_number = index
         break
       end