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 dc65a779)

7ea53e38 Fix excessive blank space in project activity view

app/views/projects/_activity.html.haml

 %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