summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
diff options
context:
space:
mode:
authorrandx <dmitriy.zaporozhets@gmail.com>2012-04-20 19:11:49 +0300
committerrandx <dmitriy.zaporozhets@gmail.com>2012-04-20 19:11:49 +0300
commit1d601616a33aaa95e2ac7b21ff041b4a840df33c (patch)
tree52f1cfdebcfa61a8890aeaeae3ab6c413e01bd7f /app/controllers/projects_controller.rb
parent60bf502bf15b95c870a8466011a6f91eb18759a9 (diff)
downloadgitlab-ce-1d601616a33aaa95e2ac7b21ff041b4a840df33c.tar.gz
Pagination and better perfomance for projects page.
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c832250a080..38fd6f3e57e 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -11,9 +11,9 @@ class ProjectsController < ApplicationController
before_filter :require_non_empty_project, :only => [:blob, :tree, :graph]
def index
- @projects = current_user.projects
- @projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse
- @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(20)
+ @projects = current_user.projects.includes(:events).order("events.created_at DESC")
+ @projects = @projects.page(params[:page]).per(40)
+ @events = Event.where(:project_id => current_user.projects.map(&:id)).recent.limit(20)
end
def new