summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-01-26 20:36:31 +0000
committerFatih Acet <acetfatih@gmail.com>2017-01-26 20:36:31 +0000
commitc5bea1d2e84adaeac54451c843e0d924cd62166b (patch)
tree0ea04d30f42478c81becc02f579261394ca91eae /app
parent04e01b6771c2d0a9eb960117c7e34e32567e3886 (diff)
parent6fbf24af278ecbb818471fae7108b669b51613e1 (diff)
downloadgitlab-ce-c5bea1d2e84adaeac54451c843e0d924cd62166b.tar.gz
Merge branch '27044-fix-explore-sorting-on-trending' into 'master'
Fix /explore sorting (trending) Closes #27044 See merge request !8792
Diffstat (limited to 'app')
-rw-r--r--app/controllers/explore/projects_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index a62c6211372..26e17a7553e 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -22,6 +22,7 @@ class Explore::ProjectsController < Explore::ApplicationController
def trending
@projects = filter_projects(Project.trending)
+ @projects = @projects.sort(@sort = params[:sort])
@projects = @projects.page(params[:page])
respond_to do |format|