Merge branch 'ui-improvements' into 'master'

Ui improvements

* fix project home page when activity set as default
* style commits, branches and tags pages to new style
* render flash message outside of content block
* style group pages

See merge request !1255

2 files changed, 2 insertions, 3 deletions

diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index e7dd20191b7..23e67371f96 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -52,7 +52,6 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
   end
 
   step 'I see compared refs' do
-    expect(page).to have_content "Compare View"
     expect(page).to have_content "Commits (1)"
     expect(page).to have_content "Showing 2 changed files"
   end
diff --git a/features/steps/shared/active_tab.rb b/features/steps/shared/active_tab.rb
index 92e099315d8..eb2ccd9d01e 100644
--- a/features/steps/shared/active_tab.rb
+++ b/features/steps/shared/active_tab.rb
@@ -6,7 +6,7 @@ module SharedActiveTab
   end
 
   def ensure_active_sub_tab(content)
-    expect(find('div.content ul.nav-tabs li.active')).to have_content(content)
+    expect(find('div.content ul.center-top-menu li.active')).to have_content(content)
   end
 
   def ensure_active_sub_nav(content)
@@ -18,7 +18,7 @@ module SharedActiveTab
   end
 
   step 'no other sub tabs should be active' do
-    expect(page).to have_selector('div.content ul.nav-tabs li.active', count: 1)
+    expect(page).to have_selector('div.content ul.center-top-menu li.active', count: 1)
   end
 
   step 'no other sub navs should be active' do