diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-26 09:02:28 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-26 09:04:35 +0100 |
| commit | 97c1a1ef64cdce75afa24075ea77333e76c9ccbf (patch) | |
| tree | 54e960093847aee8af2d865b461941b0c8b482e7 /app/views/search | |
| parent | 7ee5de19804842033c3cfdc2bf1209c27adcd7b7 (diff) | |
| download | gitlab-ce-97c1a1ef64cdce75afa24075ea77333e76c9ccbf.tar.gz | |
Updated based on feedbacksearch-ui-update
Changed some variable names
Fixed CHANGELOG entry
Diffstat (limited to 'app/views/search')
| -rw-r--r-- | app/views/search/_results.html.haml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index 204f5a36f85..711337f308e 100644 --- a/app/views/search/_results.html.haml +++ b/app/views/search/_results.html.haml @@ -1,8 +1,8 @@ -- if @objects.empty? +- if @search_objects.empty? = render partial: "search/results/empty" - else .gray-content-block - = search_entries_info @objects, @scope, @search_term + = search_entries_info(@search_objects, @scope, @search_term) - unless @show_snippets - if @project in project #{link_to @project.name_with_namespace, [@project.namespace.becomes(Namespace), @project]} @@ -13,9 +13,9 @@ .search-results - if @scope == 'projects' .term - = render 'shared/projects/list', projects: @objects + = render 'shared/projects/list', projects: @search_objects - else - = render partial: "search/results/#{@scope.singularize}", collection: @objects + = render partial: "search/results/#{@scope.singularize}", collection: @search_objects - if @scope != 'projects' - = paginate @objects, theme: 'gitlab' + = paginate(@search_objects, theme: 'gitlab') |