diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-06-12 13:20:33 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-06-13 11:07:55 +0100 |
| commit | 06440b12d839c34ab4bf1dffdd0d4f5277901f8a (patch) | |
| tree | 2ba7fb47f86b4bee02c0b859794fb3118ed35ce0 /app/views/search | |
| parent | 182104422ba9752fd3a7117d6189815ba0cdbfbb (diff) | |
| download | gitlab-ce-06440b12d839c34ab4bf1dffdd0d4f5277901f8a.tar.gz | |
Revert "Avoid loading objects from DB in ES results"
This reverts commit d9cb907c3e987363065136bafb2156e86bc5de26.
Diffstat (limited to 'app/views/search')
| -rw-r--r-- | app/views/search/_results.html.haml | 2 | ||||
| -rw-r--r-- | app/views/search/results/_issue.html.haml | 2 | ||||
| -rw-r--r-- | app/views/search/results/_merge_request.html.haml | 2 | ||||
| -rw-r--r-- | app/views/search/results/_milestone.html.haml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index 12eb8d7fa81..cb8a8a24be8 100644 --- a/app/views/search/_results.html.haml +++ b/app/views/search/_results.html.haml @@ -21,7 +21,7 @@ .search-results - if @scope == 'projects' .term - = render 'shared/projects/list', { projects: @search_objects, pipeline_status: false }.merge(@display_options) + = 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 diff --git a/app/views/search/results/_issue.html.haml b/app/views/search/results/_issue.html.haml index 1f055cdfa31..796782035f2 100644 --- a/app/views/search/results/_issue.html.haml +++ b/app/views/search/results/_issue.html.haml @@ -1,7 +1,7 @@ .search-result-row %h4 = confidential_icon(issue) - = link_to namespace_project_issue_path(issue.project.namespace.becomes(Namespace), issue.project, issue) do + = link_to [issue.project.namespace.becomes(Namespace), issue.project, issue] do %span.term.str-truncated= issue.title - if issue.closed? %span.badge.badge-danger.prepend-left-5= _("Closed") diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml index 074bb9bce8d..f0e0af11f27 100644 --- a/app/views/search/results/_merge_request.html.haml +++ b/app/views/search/results/_merge_request.html.haml @@ -1,6 +1,6 @@ .search-result-row %h4 - = link_to namespace_project_merge_request_path(merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request) do + = link_to [merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request] do %span.term.str-truncated= merge_request.title - if merge_request.merged? %span.badge.badge-primary.prepend-left-5= _("Merged") diff --git a/app/views/search/results/_milestone.html.haml b/app/views/search/results/_milestone.html.haml index 3201f1a7815..2daa96e34d1 100644 --- a/app/views/search/results/_milestone.html.haml +++ b/app/views/search/results/_milestone.html.haml @@ -1,6 +1,6 @@ .search-result-row %h4 - = link_to namespace_project_milestone_path(milestone.project.namespace.becomes(Namespace), milestone.project, milestone) do + = link_to [milestone.project.namespace.becomes(Namespace), milestone.project, milestone] do %span.term.str-truncated= milestone.title - if milestone.description.present? |