diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 15:09:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 15:09:15 +0300 |
| commit | 20d564f1064622ef0623434372ac3ceb03173331 (patch) | |
| tree | 000d95440566cd189ea774168c9756bcc8fc5fae /app/views/search | |
| parent | 26384c9a61da9922b8fa4b8351d4e42d51661b37 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/search')
| -rw-r--r-- | app/views/search/_results.html.haml | 3 | ||||
| -rw-r--r-- | app/views/search/results/_blob.html.haml | 4 | ||||
| -rw-r--r-- | app/views/search/results/_wiki_blob.html.haml | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index 629a5a045b1..8ada8c875f7 100644 --- a/app/views/search/_results.html.haml +++ b/app/views/search/_results.html.haml @@ -32,8 +32,7 @@ .term = render 'shared/projects/list', projects: @search_objects, pipeline_status: false - else - - locals = { projects: blob_projects(@search_objects) } if %w[blobs wiki_blobs].include?(@scope) - = render partial: "search/results/#{@scope.singularize}", collection: @search_objects, locals: locals + = render partial: "search/results/#{@scope.singularize}", collection: @search_objects - if @scope != 'projects' = paginate_collection(@search_objects) diff --git a/app/views/search/results/_blob.html.haml b/app/views/search/results/_blob.html.haml index 4fb72b26955..6e17a25c713 100644 --- a/app/views/search/results/_blob.html.haml +++ b/app/views/search/results/_blob.html.haml @@ -1,7 +1,5 @@ -- project = find_project_for_result_blob(projects, blob) +- project = blob.project - return unless project - -- blob = parse_search_result(blob) - blob_link = project_blob_path(project, tree_join(blob.ref, blob.path)) = render partial: 'search/results/blob_data', locals: { blob: blob, project: project, path: blob.path, 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 9afed2bbecc..3040917dd6e 100644 --- a/app/views/search/results/_wiki_blob.html.haml +++ b/app/views/search/results/_wiki_blob.html.haml @@ -1,5 +1,4 @@ -- project = find_project_for_result_blob(projects, wiki_blob) -- wiki_blob = parse_search_result(wiki_blob) +- project = wiki_blob.project - wiki_blob_link = project_wiki_path(project, wiki_blob.basename) = render partial: 'search/results/blob_data', locals: { blob: wiki_blob, project: project, path: wiki_blob.path, blob_link: wiki_blob_link } |