Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-21 17:47:00 +0300
committerDouwe Maan <douwe@gitlab.com>2015-04-23 18:11:38 +0300
commit72b090b890fc438923b9bcb35d0461564f71cebc (patch)
tree1215fa112cad7e29f58308759f47e5bd5999ae85 /app/views/groups
parentcba86eed744a9d903222bd61a9190fa1fa19a17e (diff)
Move activity feed buttons out of event_filter into actual show views.
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/show.html.haml10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 75a7f071c13..c4a7800c463 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -17,7 +17,17 @@
%section.activities.col-md-8
- if current_user
= render "events/event_last_push", event: @last_push
+
+ - if current_user
+ %ul.nav.nav-pills.event_filter.pull-right
+ %li
+ = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do
+ %i.fa.fa-rss
+ News Feed
+
= render 'shared/event_filter'
+ %hr
+
.content_list
= spinner
%aside.side.col-md-4