diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-26 15:11:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-26 15:11:43 +0300 |
commit | c15582526dd15f5ea8fac0906624cc5cd2db03ab (patch) | |
tree | bb29128600d8df3a2d5730c8cd233342d06da562 /app/views/layouts/header/_default.html.haml | |
parent | 51c18a25f2751911e134e73dbc946ee130fc6487 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/header/_default.html.haml')
-rw-r--r-- | app/views/layouts/header/_default.html.haml | 41 |
1 files changed, 8 insertions, 33 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index bbcfb9c1565..10e38ab63f7 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -19,14 +19,7 @@ .gl-display-none.gl-sm-display-block = render "layouts/nav/top_nav" - else - - experiment(:logged_out_marketing_header, actor: nil) do |e| - - e.candidate do - = render 'layouts/header/marketing_links' - - e.try(:trial_focused) do - = render 'layouts/header/marketing_links' - - e.control do - .gl-display-none.gl-sm-display-block - = render "layouts/nav/top_nav" + = render 'layouts/header/marketing_links' - if top_nav_show_search .navbar-collapse.gl-transition-medium.collapse.gl-mr-auto.global-search-container.hide-when-top-nav-responsive-open @@ -110,14 +103,8 @@ .dropdown-menu.dropdown-menu-right = render 'layouts/header/help_dropdown' - unless current_user - - experiment(:logged_out_marketing_header, actor: nil) do |e| - - e.candidate do - %li.nav-item.gl-display-none.gl-sm-display-block - = render "layouts/nav/top_nav" - - e.try(:trial_focused) do - %li.nav-item.gl-display-none.gl-sm-display-block - = render "layouts/nav/top_nav" - - e.control {} + %li.nav-item.gl-display-none.gl-sm-display-block + = render "layouts/nav/top_nav" - if header_link?(:user_dropdown) %li.nav-item.header-user.js-nav-user-dropdown.dropdown{ data: { track_label: "profile_dropdown", track_action: "click_dropdown", track_value: "", qa_selector: 'user_menu', testid: 'user-menu' }, class: ('mr-0' if has_impersonation_link) } = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do @@ -131,23 +118,11 @@ = link_to admin_impersonation_path, class: 'nav-link impersonation-btn', method: :delete, title: _('Stop impersonation'), aria: { label: _('Stop impersonation') }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body', qa_selector: 'stop_impersonation_link' } do = sprite_icon('incognito', size: 18) - if header_link?(:sign_in) - - experiment(:logged_out_marketing_header, actor: nil) do |e| - - e.candidate do - %li.nav-item.gl-display-none.gl-sm-display-block - = link_to _('Sign up now'), new_user_registration_path, class: 'gl-button btn btn-default btn-sign-in', data: { track_action: 'click_button', track_experiment: e.name, track_label: 'sign_up_now' } - %li.nav-item.gl-display-none.gl-sm-display-block - = link_to _('Login'), new_session_path(:user, redirect_to_referer: 'yes') - = render 'layouts/header/sign_in_register_button', class: 'gl-sm-display-none' - - e.try(:trial_focused) do - %li.nav-item.gl-display-none.gl-sm-display-block - = link_to _('Get a free trial'), 'https://about.gitlab.com/free-trial/', class: 'gl-button btn btn-default btn-sign-in', data: { track_action: 'click_button', track_experiment: e.name, track_label: 'get_a_free_trial' } - %li.nav-item.gl-display-none.gl-sm-display-block - = link_to _('Sign up'), new_user_registration_path, data: { track_action: 'click_button', track_experiment: e.name, track_label: 'sign_up' } - %li.nav-item.gl-display-none.gl-sm-display-block - = link_to _('Login'), new_session_path(:user, redirect_to_referer: 'yes') - = render 'layouts/header/sign_in_register_button', class: 'gl-sm-display-none' - - e.control do - = render 'layouts/header/sign_in_register_button' + %li.nav-item.gl-display-none.gl-sm-display-block + = link_to _('Sign up now'), new_user_registration_path, class: 'gl-button btn btn-default btn-sign-in' + %li.nav-item.gl-display-none.gl-sm-display-block + = link_to _('Login'), new_session_path(:user, redirect_to_referer: 'yes') + = render 'layouts/header/sign_in_register_button', class: 'gl-sm-display-none' %button.navbar-toggler.d-block.d-sm-none{ type: 'button', class: 'gl-border-none!', data: { testid: 'top-nav-responsive-toggle', qa_selector: 'mobile_navbar_button' } } %span.sr-only= _('Toggle navigation') |