summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2019-01-21 18:01:08 +0000
committerTim Zallmann <tzallmann@gitlab.com>2019-01-21 18:01:08 +0000
commitdc65a77992f7e965fa4cd843a21eaa59b7a7e6c1 (patch)
tree0cd7808270e315ff627558fdbc734889f736f1f5 /app/views/projects
parent3fd9e48a7edad05770eb09f7753a0a649f6ca728 (diff)
parent7ea53e380299460cb6d7e683eeff38845224bf44 (diff)
downloadgitlab-ce-dc65a77992f7e965fa4cd843a21eaa59b7a7e6c1.tar.gz
Merge branch 'sh-fix-issue-56225' into 'master'
Fix excessive blank space in project activity view Closes #56225 See merge request gitlab-org/gitlab-ce!24510
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/_activity.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml
index 31f1cf560e2..12da62f4c64 100644
--- a/app/views/projects/_activity.html.haml
+++ b/app/views/projects/_activity.html.haml
@@ -1,5 +1,5 @@
%div{ class: container_class }
- .nav-block.d-none.d-sm-block.activities
+ .nav-block.d-none.d-sm-flex.activities
= render 'shared/event_filter'
.controls
= link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn d-none d-sm-inline-block has-tooltip' do