deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merged activities & projects pages

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-20 00:05:35 +02:00
parent 724ea16c34
commit cadf12c60c
9 changed files with 11 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/dashboard_controller.rb
View file

@ -34,9 +34,4 @@ class DashboardController < ApplicationController
format.atom { render :layout => false }
end
end
def activities
@projects = current_user.projects.all
@events = Event.where(:project_id => @projects.map(&:id)).recent.limit(40)
end
end

2
app/controllers/projects_controller.rb
View file

@ -13,6 +13,7 @@ class ProjectsController < ApplicationController
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(40)
end
def new
@ -78,7 +79,6 @@ class ProjectsController < ApplicationController
render "projects/empty"
end
end
format.js
end
end