diff options
Diffstat (limited to 'app/views/layouts/_head.html.haml')
| -rw-r--r-- | app/views/layouts/_head.html.haml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index b869298e99d..1c87452f0a3 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -1,6 +1,6 @@ - page_description brand_title unless page_description --# Needs a redirect on the client side since it's using an anchor to distuingish +-# Needs a redirect on the client side since it's using an anchor to distinguish -# between sign in and registration. We need to inline the JS to not render -# anything from this page beforehand. -# Part of an experiment to build a new sign up flow. Will be removed again with @@ -16,12 +16,7 @@ %head{ prefix: "og: http://ogp.me/ns#" } %meta{ charset: "utf-8" } - - if ActionController::Base.asset_host - %link{ rel: 'dns-prefetch', href: ActionController::Base.asset_host } - %link{ rel: 'preconnect', href: ActionController::Base.asset_host, crossorigin: '' } - - - if Gitlab::CurrentSettings.snowplow_enabled? && Gitlab::CurrentSettings.snowplow_collector_hostname - %link{ rel: 'preconnect', href: Gitlab::CurrentSettings.snowplow_collector_hostname, crossorigin: '' } + = render 'layouts/loading_hints' %meta{ 'http-equiv' => 'X-UA-Compatible', content: 'IE=edge' } @@ -54,6 +49,8 @@ = stylesheet_link_tag_defer "application_dark" - else = stylesheet_link_tag_defer "application" + - unless use_startup_css? + = stylesheet_link_tag_defer "themes/theme_#{user_application_theme_name}" = stylesheet_link_tag "disable_animations", media: "all" if Rails.env.test? || Gitlab.config.gitlab['disable_animations'] = stylesheet_link_tag_defer 'performance_bar' if performance_bar_enabled? @@ -73,7 +70,8 @@ = yield :page_specific_javascripts = webpack_controller_bundle_tags - = webpack_bundle_tag "chrome_84_icon_fix" if browser.chrome?([">=84", "<85"]) || browser.edge?([">=84", "<85"]) + = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? + = webpack_bundle_tag "chrome_84_icon_fix" if browser.chrome?([">=84", "<84.0.4147.125"]) || browser.edge?([">=84", "<84.0.522.59"]) = yield :project_javascripts |