Merge branch 'dz-fix-branches-tab-test' into 'master'

Fix active tab test for branches page

For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378

See merge request !6923

features/steps/project/active_tab.rb

@@ -54,7 +54,7 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
   end
 
   step 'I click the "Branches" tab' do
-    page.within '.content' do
+    page.within '.sub-nav' do
       click_link('Branches')
     end
   end