Commit f2f35849 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'issue_13933' into 'master'

Include pagination for other than projects search

Pagination for projects results is already added on views/shared/projects/_list.html.haml

Fixes #13933

See merge request !3056
parents e1bc8087 e677bac9
No related merge requests found
...@@ -18,7 +18,9 @@ ...@@ -18,7 +18,9 @@
= render 'shared/projects/list', projects: @objects = render 'shared/projects/list', projects: @objects
- else - else
= render partial: "search/results/#{@scope.singularize}", collection: @objects = render partial: "search/results/#{@scope.singularize}", collection: @objects
= paginate @objects, theme: 'gitlab'
- if @scope != 'projects'
= paginate @objects, theme: 'gitlab'
:javascript :javascript
$(".search-results .term").highlight("#{escape_javascript(params[:search])}"); $(".search-results .term").highlight("#{escape_javascript(params[:search])}");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment