diff options
author | Robert Speicher <robert@gitlab.com> | 2017-05-26 19:14:30 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-05-26 19:14:30 +0300 |
commit | 33b622e353ba244ac62e61b6db0e382275ca905c (patch) | |
tree | 4f996dafbb46a92a7966cec2dbfa2a7c2e8286c9 /app/controllers | |
parent | 70714f57ebe4ac1370eba38af1ca534708f90433 (diff) | |
parent | f2a53667c0a599edc41f0e392d7a724efaaa400c (diff) |
Merge branch 'dm-consistent-last-push-event' into 'master'
Consistently display last push event widget
See merge request !11585
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 3 | ||||
-rw-r--r-- | app/controllers/dashboard_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/groups_controller.rb | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index 5a1efcab1a3..3d49ea97591 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -8,7 +8,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController @projects = load_projects(params.merge(non_public: true)).page(params[:page]) respond_to do |format| - format.html { @last_push = current_user.recent_push } + format.html format.atom do load_events render layout: false @@ -25,7 +25,6 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController @projects = load_projects(params.merge(starred: true)). includes(:forked_from_project, :tags).page(params[:page]) - @last_push = current_user.recent_push @groups = [] respond_to do |format| diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 79d420a32d3..6195121b931 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -9,8 +9,6 @@ class DashboardController < Dashboard::ApplicationController respond_to :html def activity - @last_push = current_user.recent_push - respond_to do |format| format.html diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 965ced4d372..3e921a1b1cb 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -165,7 +165,6 @@ class GroupsController < Groups::ApplicationController def user_actions if current_user - @last_push = current_user.recent_push @notification_setting = current_user.notification_settings_for(group) end end |