Merge branch '32570-project-activity-tab-border' into 'master'

app/assets/stylesheets/framework/nav.scss

@@ -443,8 +443,8 @@
   }
 }
 
-.activities {
-  .nav-block {
+.nav-block {
+  &.activities {
     border-bottom: 1px solid $border-color;
 
     .nav-links {

app/views/dashboard/_activities.html.haml

 .hidden-xs
   = render "events/event_last_push", event: @last_push
 
-.nav-block
+.nav-block.activities
   .controls
     = link_to dashboard_projects_path(rss_url_options), class: 'btn rss-btn has-tooltip', title: 'Subscribe' do
       %i.fa.fa-rss

app/views/projects/_activity.html.haml

 - @no_container = true
 
 %div{ class: container_class }
-  .nav-block.activity-filter-block
+  .nav-block.activity-filter-block.activities
     .controls
       = link_to namespace_project_path(@project.namespace, @project, rss_url_options), title: "Subscribe", class: 'btn rss-btn has-tooltip' do
         = icon('rss')

changelogs/unreleased/32570-project-activity-tab-border.yml

+---
+title: Fix border-bottom for project activity tab
+merge_request:
+author: