Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 10 deletions

diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index ea2f452b9e2..dd441d0d155 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -37,7 +37,7 @@
   = stylesheet_link_tag "disable_animations", media: "all" if Rails.env.test? || Gitlab.config.gitlab['disable_animations']
   = stylesheet_link_tag "test_environment", media: "all" if Rails.env.test?
 
-  = stylesheet_link_tag_defer "fonts" if use_new_fonts?
+  = stylesheet_link_tag_defer "fonts"
 
   = stylesheet_link_tag_defer "highlight/themes/#{user_color_scheme}"
 
diff --git a/app/views/layouts/_loading_hints.html.haml b/app/views/layouts/_loading_hints.html.haml
index 60ab6927fd2..9026bec84c3 100644
--- a/app/views/layouts/_loading_hints.html.haml
+++ b/app/views/layouts/_loading_hints.html.haml
@@ -13,7 +13,6 @@
   = preload_link_tag(path_to_stylesheet("highlight/themes/#{user_color_scheme}"), crossorigin: css_crossorigin)
   - if Gitlab::Tracking.enabled? && Gitlab::Tracking.collector_hostname
     %link{ rel: 'preconnect', href: "https://#{Gitlab::Tracking.collector_hostname}", crossorigin: '' }
-  - if use_new_fonts?
     -# Do not use preload_link_tag for fonts, to work around Firefox double-fetch bug.
     -# See https://github.com/web-platform-tests/wpt/pull/36930
     %link{ rel: 'preload', href: font_path('gitlab-sans/GitLabSans.woff2'), as: 'font', crossorigin: css_crossorigin }
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 3b2cd4c30dd..5c7010bf523 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -129,15 +129,12 @@
             %li.nav-item.impersonation.ml-0
               = render Pajamas::ButtonComponent.new(href: admin_impersonation_path, icon: 'incognito', button_options: { title: _('Stop impersonation'), class: 'impersonation-btn', aria: { label: _('Stop impersonation') }, data: { method: :delete, toggle: 'tooltip', placement: 'bottom', container: 'body', qa_selector: 'stop_impersonation_link' } })
           - if header_link?(:sign_in)
-            - if Gitlab.com?
-              %li.nav-item.gl-display-none.gl-sm-display-block
+            - if allow_signup?
+              %li.nav-item
                 = render Pajamas::ButtonComponent.new(href: new_user_registration_path) do
-                  = _('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'
-            - else
-              = render 'layouts/header/sign_in_register_button'
+                  = _('Register')
+            %li.nav-item
+              = link_to _('Sign in'), new_session_path(:user, redirect_to_referer: 'yes')
 
       %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')