summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-08-15 06:35:46 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-08-15 06:35:46 +0000
commitd47f17a242f5563d090c544ee1ee12e887629ca0 (patch)
treee91039cd26aa4007073fef53dbc8cc854e2be4ba
parent5fcaac928b2077bfac3538eab551161699ca8c11 (diff)
parent82bc5687ced2191583cf6b77f51cd0486be9e0cb (diff)
downloadgitlab-ce-d47f17a242f5563d090c544ee1ee12e887629ca0.tar.gz
Merge branch '5300/ccr/elasticsearch_index' into 'master'
Modified find project method to return nil if project not found See merge request gitlab-org/gitlab-ce!21168
-rw-r--r--app/views/search/results/_blob.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/search/results/_blob.html.haml b/app/views/search/results/_blob.html.haml
index fdcd126e7a3..a8d4d4af93a 100644
--- a/app/views/search/results/_blob.html.haml
+++ b/app/views/search/results/_blob.html.haml
@@ -1,4 +1,6 @@
- project = find_project_for_result_blob(blob)
+- return unless project
+
- file_name, blob = parse_search_result(blob)
- blob_link = project_blob_path(project, tree_join(blob.ref, file_name))