diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-05-20 14:27:35 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-05-25 15:21:30 -0500 |
commit | e45e540d1d90549cc5f45521360241afce9eaf18 (patch) | |
tree | 5a01a839261b97ea3caac9621fe19bb80e15a93b /app/views/groups | |
parent | e20eb71203aa29458d7f51a27d42a3d8208e2494 (diff) | |
download | gitlab-ce-e45e540d1d90549cc5f45521360241afce9eaf18.tar.gz |
Consistently display last push event widget
Diffstat (limited to 'app/views/groups')
-rw-r--r-- | app/views/groups/_activities.html.haml | 3 | ||||
-rw-r--r-- | app/views/groups/_head.html.haml | 3 | ||||
-rw-r--r-- | app/views/groups/show.html.haml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/groups/_activities.html.haml b/app/views/groups/_activities.html.haml index d7851c79990..fd6e7111f38 100644 --- a/app/views/groups/_activities.html.haml +++ b/app/views/groups/_activities.html.haml @@ -1,6 +1,3 @@ -.hidden-xs - = render "events/event_last_push", event: @last_push - .nav-block .controls = link_to group_path(@group, rss_url_options), class: 'btn rss-btn has-tooltip' , title: 'Subscribe' do diff --git a/app/views/groups/_head.html.haml b/app/views/groups/_head.html.haml index 873504099d4..0f63774fb9b 100644 --- a/app/views/groups/_head.html.haml +++ b/app/views/groups/_head.html.haml @@ -12,3 +12,6 @@ = link_to activity_group_path(@group), title: 'Activity' do %span Activity + +.hidden-xs + = render "projects/last_push" diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 18997baa998..d3a2fdff804 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -4,8 +4,8 @@ = auto_discovery_link_tag(:atom, group_url(@group, rss_url_options), title: "#{@group.name} activity") = render 'groups/head' -= render 'groups/home_panel' += render 'groups/home_panel' .groups-header{ class: container_class } .top-area |