diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-03 21:07:32 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-03 21:07:32 +0300 |
| commit | f2f35849adc609efff2a3ba16ecb747d36a45e7c (patch) | |
| tree | 19366787888729dd20690e11007328f3baf1593c | |
| parent | e1bc808746523309476913033b104345c06c4816 (diff) | |
| parent | e677bac933b888282a1638d0337938bd0ad449b1 (diff) | |
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
| -rw-r--r-- | app/views/search/_results.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index eef7b7b5efd..60df348891c 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])}"); |