Merge branch 'rummik-master-patch-95386' into 'master'

Fix group activity border to extend under RSS link

See merge request gitlab-org/gitlab-ce!19362

app/views/groups/_activities.html.haml

-.nav-block
+.nav-block.activities
   .controls
     = link_to group_path(@group, rss_url_options), class: 'btn rss-btn has-tooltip' , title: 'Subscribe' do
       %i.fa.fa-rss