From 983a0bba5d2a042c4a3bbb22432ec192c7501d82 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Apr 2020 18:38:24 +0000 Subject: Add latest changes from gitlab-org/gitlab@12-10-stable-ee --- app/views/layouts/_page.html.haml | 3 ++- app/views/layouts/header/_current_user_dropdown.html.haml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app/views/layouts') diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 06e3bca99a1..80a14412968 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -5,7 +5,8 @@ .mobile-overlay .alert-wrapper = render 'shared/outdated_browser' - = render_if_exists "layouts/header/ee_license_banner" + - if Feature.enabled?(:subscribable_banner_license) + = 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/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml index c6299f244ec..410b120396d 100644 --- a/app/views/layouts/header/_current_user_dropdown.html.haml +++ b/app/views/layouts/header/_current_user_dropdown.html.haml @@ -26,7 +26,7 @@ - if current_user_menu?(:settings) %li = link_to s_("CurrentUser|Settings"), profile_path, data: { qa_selector: 'settings_link' } - = render_if_exists 'layouts/header/buy_ci_minutes' + = render_if_exists 'layouts/header/buy_ci_minutes', project: @project, namespace: @group - if current_user_menu?(:help) %li.divider.d-md-none -- cgit v1.2.1