Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 5 deletions

diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 06e3bca99a1..16089a00386 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -5,7 +5,7 @@
     .mobile-overlay
     .alert-wrapper
       = render 'shared/outdated_browser'
-      = render_if_exists "layouts/header/ee_license_banner"
+      = render_if_exists "layouts/header/ee_subscribable_banner"
       = render "layouts/broadcast"
       = render "layouts/header/read_only_banner"
       = render "layouts/nav/classification_level_banner"
diff --git a/app/views/layouts/nav/sidebar/_analytics_links.html.haml b/app/views/layouts/nav/sidebar/_analytics_links.html.haml
index 90f9432af03..a99eb8cf457 100644
--- a/app/views/layouts/nav/sidebar/_analytics_links.html.haml
+++ b/app/views/layouts/nav/sidebar/_analytics_links.html.haml
@@ -1,17 +1,18 @@
 - navbar_links = links.sort_by(&:title)
 - all_paths = navbar_links.map(&:path)
+- analytics_link = navbar_links.find { |link| link.title == _('Value Stream') } || navbar_links.first
 
 - if navbar_links.any?
   = nav_link(path: all_paths) do
-    = link_to navbar_links.first.link do
+    = link_to analytics_link.link, { data: { qa_selector: 'analytics_anchor' } } do
       .nav-icon-container
         = sprite_icon('chart')
       %span.nav-item-name{ data: { qa_selector: 'analytics_link' } }
         = _('Analytics')
 
     %ul.sidebar-sub-level-items{ data: { qa_selector: 'analytics_sidebar_submenu' } }
-      = nav_link(path: navbar_links.first.path, html_options: { class: "fly-out-top-item" } ) do
-        = link_to navbar_links.first.link do
+      = nav_link(path: analytics_link.path, html_options: { class: "fly-out-top-item" } ) do
+        = link_to analytics_link.link do
           %strong.fly-out-top-item-name
             = _('Analytics')
       %li.divider.fly-out-top-item
diff --git a/app/views/layouts/terms.html.haml b/app/views/layouts/terms.html.haml
index cdad617f006..1f7cf486b2c 100644
--- a/app/views/layouts/terms.html.haml
+++ b/app/views/layouts/terms.html.haml
@@ -26,7 +26,7 @@
                   %ul.nav.navbar-nav
                     %li.header-user.dropdown
                       = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
-                        = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar qa-user-avatar"
+                        = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar", data: { qa_selector: 'user_avatar' }
                         = sprite_icon('angle-down', css_class: 'caret-down')
                       .dropdown-menu.dropdown-menu-right
                         = render 'layouts/header/current_user_dropdown'