From c64e61fa574ccfbf2f3a4443b2e095da9c44c5a3 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Mon, 21 Jan 2019 18:01:08 +0000 Subject: [PATCH] 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 (cherry picked from commit dc65a77992f7e965fa4cd843a21eaa59b7a7e6c1) 7ea53e38 Fix excessive blank space in project activity view --- app/views/projects/_activity.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- GitLab