summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2015-09-15 15:33:44 -0500
committerDrew Blessing <drew@gitlab.com>2015-10-01 15:17:32 -0500
commit788a3f9b94f5500bbbe3f3c4955c6c41196a736e (patch)
tree7cb4077600e1be8cab6145ccae5de3334e299193
parent529cf138a18b33aea35aab5a7b72f705df5e2982 (diff)
downloadgitlab-ce-788a3f9b94f5500bbbe3f3c4955c6c41196a736e.tar.gz
Add last push widget to starred projects dashboard
-rw-r--r--app/controllers/dashboard/projects_controller.rb1
-rw-r--r--app/views/dashboard/projects/starred.html.haml3
2 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 467d0f81aca..58e9049f158 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -20,6 +20,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
@projects = current_user.starred_projects
@projects = @projects.includes(:namespace, :forked_from_project, :tags)
@projects = @projects.sort(@sort = params[:sort])
+ @last_push = current_user.recent_push
@groups = []
respond_to do |format|
diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml
index 339362701d4..f75f2e0a32a 100644
--- a/app/views/dashboard/projects/starred.html.haml
+++ b/app/views/dashboard/projects/starred.html.haml
@@ -3,6 +3,9 @@
= render 'dashboard/projects_head'
+- if @last_push
+ = render "events/event_last_push", event: @last_push
+
- if @projects.any?
= render 'projects'
- else