summaryrefslogtreecommitdiff
path: root/app/controllers/explore
diff options
context:
space:
mode:
authorJosh Frye <joshfng@gmail.com>2016-02-03 16:33:01 -0500
committerJosh Frye <joshfng@gmail.com>2016-02-04 11:40:19 -0500
commit7522ac0b3cf4a777fda5dce3baa699970e5133a6 (patch)
tree79055e852a8f3e0d3da01514e352207d3e533cd3 /app/controllers/explore
parent87b61db7ed6b782423397626b6ea414c43f24a15 (diff)
downloadgitlab-ce-7522ac0b3cf4a777fda5dce3baa699970e5133a6.tar.gz
Paginate + ajax filter dashboard projects
Diffstat (limited to 'app/controllers/explore')
-rw-r--r--app/controllers/explore/projects_controller.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index a5aeaed66c5..2689bf4f1ec 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -11,14 +11,14 @@ class Explore::ProjectsController < Explore::ApplicationController
end
def trending
- @trending_projects = TrendingProjectsFinder.new.execute(current_user)
- @trending_projects = @trending_projects.non_archived
- @trending_projects = @trending_projects.page(params[:page]).per(PER_PAGE)
+ @projects = TrendingProjectsFinder.new.execute(current_user)
+ @projects = @projects.non_archived
+ @projects = @projects.page(params[:page]).per(PER_PAGE)
end
def starred
- @starred_projects = ProjectsFinder.new.execute(current_user)
- @starred_projects = @starred_projects.reorder('star_count DESC')
- @starred_projects = @starred_projects.page(params[:page]).per(PER_PAGE)
+ @projects = ProjectsFinder.new.execute(current_user)
+ @projects = @projects.reorder('star_count DESC')
+ @projects = @projects.page(params[:page]).per(PER_PAGE)
end
end