diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-06 16:59:45 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-06 16:59:45 +0000 |
| commit | 69b2a78826c2921e2ba80a769f1deac78bafe38c (patch) | |
| tree | e1e39380a81d2d557aac4135dcf0343f7592ac4a /app | |
| parent | 1e6b82a575d5f9a2dc3b69d74bf4dd06357939b7 (diff) | |
| parent | 58bfd733310effa94af0e1f1f19e53e34235cffc (diff) | |
| download | gitlab-ce-69b2a78826c2921e2ba80a769f1deac78bafe38c.tar.gz | |
Merge branch 'blob-count2' into 'master'
Support unlimited file search in web UI and API
See merge request gitlab-org/gitlab-ce!23553
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/search/results/_blob.html.haml | 6 | ||||
| -rw-r--r-- | app/views/search/results/_wiki_blob.html.haml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/search/results/_blob.html.haml b/app/views/search/results/_blob.html.haml index a8d4d4af93a..2a602095845 100644 --- a/app/views/search/results/_blob.html.haml +++ b/app/views/search/results/_blob.html.haml @@ -1,7 +1,7 @@ - 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)) +- blob = parse_search_result(blob) +- blob_link = project_blob_path(project, tree_join(blob.ref, blob.filename)) -= render partial: 'search/results/blob_data', locals: { blob: blob, project: project, file_name: file_name, blob_link: blob_link } += render partial: 'search/results/blob_data', locals: { blob: blob, project: project, file_name: blob.filename, blob_link: blob_link } diff --git a/app/views/search/results/_wiki_blob.html.haml b/app/views/search/results/_wiki_blob.html.haml index 4346217c230..389e4cc75b9 100644 --- a/app/views/search/results/_wiki_blob.html.haml +++ b/app/views/search/results/_wiki_blob.html.haml @@ -1,5 +1,5 @@ - project = find_project_for_result_blob(wiki_blob) -- file_name, wiki_blob = parse_search_result(wiki_blob) +- wiki_blob = parse_search_result(wiki_blob) - wiki_blob_link = project_wiki_path(project, wiki_blob.basename) -= render partial: 'search/results/blob_data', locals: { blob: wiki_blob, project: project, file_name: file_name, blob_link: wiki_blob_link } += render partial: 'search/results/blob_data', locals: { blob: wiki_blob, project: project, file_name: wiki_blob.filename, blob_link: wiki_blob_link } |