summaryrefslogtreecommitdiff
path: root/app/views/projects/_activity.html.haml
diff options
context:
space:
mode:
authorKushal Pandya <kushal@gitlab.com>2018-07-11 15:28:23 +0530
committerKushal Pandya <kushal@gitlab.com>2018-07-13 12:32:07 +0530
commit37737b5fe8bf3cbe9376da6bdad1a1f1a7cb5f70 (patch)
tree5f4a5c1ad276171ef364491d683ddc34dd2701f9 /app/views/projects/_activity.html.haml
parent924146a8d6b158fda1f9cddbdcd8ce957b6baec9 (diff)
downloadgitlab-ce-37737b5fe8bf3cbe9376da6bdad1a1f1a7cb5f70.tar.gz
Update `.controls` positioning
Diffstat (limited to 'app/views/projects/_activity.html.haml')
-rw-r--r--app/views/projects/_activity.html.haml3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml
index 1f701f2aa1b..6bf21570d41 100644
--- a/app/views/projects/_activity.html.haml
+++ b/app/views/projects/_activity.html.haml
@@ -1,10 +1,9 @@
%div{ class: container_class }
.nav-block.activity-filter-block.activities
+ = render 'shared/event_filter'
.controls
= link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn rss-btn has-tooltip' do
= icon('rss')
- = render 'shared/event_filter'
-
.content_list.project-activity{ :"data-href" => activity_project_path(@project) }
= spinner