diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:47:36 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:47:36 +0200 |
| commit | c993481d991333fe0750080eec98fd2e9eeda8d5 (patch) | |
| tree | 7d1fdd7926f8542b7fbf7add052004dbfd48b206 /app/views/projects/_activity.html.haml | |
| parent | 83f04853e9a749c3397ee7683a78b986e1070904 (diff) | |
| parent | 123669a55107514798ba531ba3a744b3ec8503ee (diff) | |
| download | gitlab-ce-git-archive-golang.tar.gz | |
Merge branch 'master' into git-archive-golanggit-archive-golang
Diffstat (limited to 'app/views/projects/_activity.html.haml')
| -rw-r--r-- | app/views/projects/_activity.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml index 1261f6254d7..c2683bc6219 100644 --- a/app/views/projects/_activity.html.haml +++ b/app/views/projects/_activity.html.haml @@ -1,10 +1,9 @@ = render 'projects/last_push' .gray-content-block.activity-filter-block - if current_user - %ul.nav.nav-pills.event_filter.pull-right - %li - = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "Feed", class: 'rss-btn' do - %i.fa.fa-rss + .pull-right + = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "Feed", class: 'btn rss-btn' do + %i.fa.fa-rss = render 'shared/event_filter' .content_list{:"data-href" => activity_project_path(@project)} |