From f01c54eeef9a30044d974403aec371577e1a04c2 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Tue, 1 Mar 2016 20:09:30 -0500 Subject: [PATCH 1/2] Include pagination for other than projects search --- app/views/search/_results.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index eef7b7b5ef..e389ec1d2b 100644 --- a/app/views/search/_results.html.haml +++ b/app/views/search/_results.html.haml @@ -18,7 +18,7 @@ = render 'shared/projects/list', projects: @objects - else = render partial: "search/results/#{@scope.singularize}", collection: @objects - = paginate @objects, theme: 'gitlab' + = paginate @objects, theme: 'gitlab' :javascript $(".search-results .term").highlight("#{escape_javascript(params[:search])}"); From e677bac933b888282a1638d0337938bd0ad449b1 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 2 Mar 2016 15:46:37 -0500 Subject: [PATCH 2/2] Place pagination outside .search-results --- app/views/search/_results.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index e389ec1d2b..60df348891 100644 --- a/app/views/search/_results.html.haml +++ b/app/views/search/_results.html.haml @@ -18,7 +18,9 @@ = render 'shared/projects/list', projects: @objects - else = render partial: "search/results/#{@scope.singularize}", collection: @objects - = paginate @objects, theme: 'gitlab' + + - if @scope != 'projects' + = paginate @objects, theme: 'gitlab' :javascript $(".search-results .term").highlight("#{escape_javascript(params[:search])}");