Merge branch 'add_last_push_widget' into 'master'
Add last push widget to starred projects dashboard This adds the last push widget to the starred projects dashboard. If a user set the starred projects dashboard as their preferred dashboard they would not see last push widget. The look is seamless between starred and 'your projects' dashboards. ### Screenshot: ![Screen_Shot_2015-10-01_at_3.15.52_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2f5dcf49c3d0186bdd05bb6788b143f1/Screen_Shot_2015-10-01_at_3.15.52_PM.png) See merge request !1304
This commit is contained in:
commit
b69b2520b1
|
@ -20,6 +20,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
|
||||||
@projects = current_user.starred_projects
|
@projects = current_user.starred_projects
|
||||||
@projects = @projects.includes(:namespace, :forked_from_project, :tags)
|
@projects = @projects.includes(:namespace, :forked_from_project, :tags)
|
||||||
@projects = @projects.sort(@sort = params[:sort])
|
@projects = @projects.sort(@sort = params[:sort])
|
||||||
|
@last_push = current_user.recent_push
|
||||||
@groups = []
|
@groups = []
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
|
|
|
@ -3,6 +3,9 @@
|
||||||
|
|
||||||
= render 'dashboard/projects_head'
|
= render 'dashboard/projects_head'
|
||||||
|
|
||||||
|
- if @last_push
|
||||||
|
= render "events/event_last_push", event: @last_push
|
||||||
|
|
||||||
- if @projects.any?
|
- if @projects.any?
|
||||||
= render 'projects'
|
= render 'projects'
|
||||||
- else
|
- else
|
||||||
|
|
Loading…
Reference in New Issue