14 files changed, 26 insertions, 26 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 53ecad1b474..bbde5f2843b 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -4,7 +4,7 @@
 %head{ omit_og ? { } : { prefix: "og: http://ogp.me/ns#" } }
   %meta{ charset: "utf-8" }
   %meta{ 'http-equiv' => 'X-UA-Compatible', content: 'IE=edge' }
-  %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1' }
+  %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }
   %title= page_title(site_name)
   = Gon::Base.render_data(nonce: content_security_policy_nonce)
   = yield :project_javascripts
@@ -48,6 +48,16 @@
     = webpack_bundle_tag 'legacy_sentry'
   = webpack_bundle_tag 'performance_bar' if performance_bar_enabled?
 
+  - if vite_enabled
+    %meta{ name: 'controller-path', content: controller_full_path }
+    - if Rails.env.development?
+      = vite_client_tag
+    = vite_javascript_tag "main"
+    - if Gitlab.ee?
+      = vite_javascript_tag "main_ee"
+    - if Gitlab.jh?
+      = vite_javascript_tag "main_jh"
+
   = yield :page_specific_javascripts
 
   = webpack_bundle_tag 'super_sidebar' if show_super_sidebar?
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 95627c2884a..f52ea801eef 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -20,7 +20,6 @@
     .mobile-overlay
     = dispensable_render_if_exists 'layouts/header/verification_reminder'
     .alert-wrapper.gl-force-block-formatting-context
-      = yield :code_suggestions_third_party_alert
       = dispensable_render 'shared/new_nav_announcement'
       = dispensable_render 'shared/outdated_browser'
       = dispensable_render_if_exists "layouts/header/licensed_user_count_threshold"
@@ -37,6 +36,7 @@
       = dispensable_render_if_exists "layouts/header/seat_count_alert"
       = dispensable_render_if_exists "shared/namespace_user_cap_reached_alert"
       = dispensable_render_if_exists "shared/new_user_signups_cap_reached_alert"
+      = dispensable_render_if_exists "shared/silent_mode_banner"
       = yield :page_level_alert
       = yield :group_invite_members_banner
       - unless @hide_top_bar
diff --git a/app/views/layouts/_snowplow.html.haml b/app/views/layouts/_snowplow.html.haml
index 399a826d611..10b2002dfef 100644
--- a/app/views/layouts/_snowplow.html.haml
+++ b/app/views/layouts/_snowplow.html.haml
@@ -2,6 +2,8 @@
 
 - namespace = @group || @project&.namespace || @namespace
 = webpack_bundle_tag 'tracker'
+- if Gitlab.com? && Feature.enabled?(:browsersdk_tracking)
+  = webpack_bundle_tag 'analytics'
 = javascript_tag do
   :plain
     window.snowplowOptions = #{Gitlab::Tracking.options(@group).to_json}
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 28cbdf0a7a1..451c66b074b 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -12,13 +12,8 @@
     = render 'peek/bar'
     = header_message
 
-    - if show_super_sidebar? # TODO: Move this CSS to a better place
-      - if current_user
-        :css
-          body {
-            --header-height: 0px;
-          }
-      - else
+    - if show_super_sidebar?
+      - if !current_user
         = render partial: "layouts/header/super_sidebar_logged_out"
     - else
       = render partial: "layouts/header/default", locals: { project: @project, group: @group }
diff --git a/app/views/layouts/errors.html.haml b/app/views/layouts/errors.html.haml
index 5ad20478f51..d07daf0aab9 100644
--- a/app/views/layouts/errors.html.haml
+++ b/app/views/layouts/errors.html.haml
@@ -1,7 +1,7 @@
 !!! 5
 %html{ lang: I18n.locale }
   %head
-    %meta{ :content => "width=device-width, initial-scale=1, maximum-scale=1", :name => "viewport" }
+    %meta{ :content => "width=device-width, initial-scale=1", :name => "viewport" }
     %title= yield(:title)
     %style
       = Rails.application.assets_manifest.find_sources('errors.css').first.to_s.html_safe
diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index 83641fbb184..1d67ac942fa 100644
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
@@ -21,7 +21,6 @@
   = render 'groups/invite_members_modal', group: @group
 
 = dispensable_render_if_exists "shared/web_hooks/group_web_hook_disabled_alert"
-= dispensable_render_if_exists "shared/code_suggestions_third_party_alert", source: @group
 = dispensable_render_if_exists "shared/free_user_cap_alert", source: @group
 = dispensable_render_if_exists "shared/unlimited_members_during_trial_alert", resource: @group
 
diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml
index 7ce914cf660..75de13d4862 100644
--- a/app/views/layouts/header/_current_user_dropdown.html.haml
+++ b/app/views/layouts/header/_current_user_dropdown.html.haml
@@ -43,7 +43,7 @@
       = link_to _("Switch to GitLab Next"), Gitlab::Saas.canary_toggle_com_url, data: { track_action: "click_link", track_label: "switch_to_canary", track_property: "navigation_top" }
 
   %li.divider
-  .js-new-nav-toggle{ data: { enabled: show_super_sidebar?.to_s, endpoint: profile_preferences_url} }
+  .js-new-nav-toggle{ data: { enabled: show_super_sidebar?.to_s, endpoint: profile_preferences_path} }
 
   - if current_user_menu?(:sign_out)
     %li.divider
diff --git a/app/views/layouts/header/_super_sidebar_logged_out.haml b/app/views/layouts/header/_super_sidebar_logged_out.haml
index 67322aced74..31dfdfb2bb3 100644
--- a/app/views/layouts/header/_super_sidebar_logged_out.haml
+++ b/app/views/layouts/header/_super_sidebar_logged_out.haml
@@ -44,4 +44,4 @@
           - if allow_signup?
             %li
               = render Pajamas::ButtonComponent.new(href: new_user_registration_path, variant: :confirm) do
-                = _('Register')
+                = Gitlab.com? ? _('Get free trial') : _('Register')
diff --git a/app/views/layouts/minimal.html.haml b/app/views/layouts/minimal.html.haml
index 5531c0ab23a..8b6a2a2f2a7 100644
--- a/app/views/layouts/minimal.html.haml
+++ b/app/views/layouts/minimal.html.haml
@@ -3,7 +3,7 @@
 !!! 5
 %html{ lang: I18n.locale, class: page_classes }
   = render "layouts/head"
-  %body{ data: body_data }
+  %body{ data: body_data, class: system_message_class }
     = header_message
     = render 'peek/bar'
     = render 'layouts/published_experiments'
diff --git a/app/views/layouts/oauth_error.html.haml b/app/views/layouts/oauth_error.html.haml
index d5e0e8e9c1d..697bd9b5864 100644
--- a/app/views/layouts/oauth_error.html.haml
+++ b/app/views/layouts/oauth_error.html.haml
@@ -1,7 +1,7 @@
 !!! 5
 %html{ lang: I18n.locale }
   %head
-    %meta{ :content => "width=device-width, initial-scale=1, maximum-scale=1", :name => "viewport" }
+    %meta{ :content => "width=device-width, initial-scale=1", :name => "viewport" }
     %title= yield(:title)
     = stylesheet_link_tag 'application_utilities'
     %style
diff --git a/app/views/layouts/organization.html.haml b/app/views/layouts/organization.html.haml
index 5a357c6f805..7e1bf228876 100644
--- a/app/views/layouts/organization.html.haml
+++ b/app/views/layouts/organization.html.haml
@@ -1,6 +1,6 @@
-- page_title @organization.name
-- header_title @organization.name, organization_path(@organization)
-- nav "organization"
+- page_title @organization.name if @organization
+- header_title @organization.name, organization_path(@organization) if @organization
+- nav(%w[index new].include?(params[:action]) ? "your_work" : "organization")
 - @left_sidebar = true
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 18ae3353f4d..1e85bb6cc3a 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -23,7 +23,6 @@
   = render 'projects/invite_members_modal', project: @project
 
 = dispensable_render_if_exists "shared/web_hooks/web_hook_disabled_alert"
-= dispensable_render_if_exists "projects/code_suggestions_third_party_alert", project: @project
 = dispensable_render_if_exists "projects/free_user_cap_alert", project: @project
 = dispensable_render_if_exists 'shared/unlimited_members_during_trial_alert', resource: @project
 
diff --git a/app/views/layouts/service_desk.html.haml b/app/views/layouts/service_desk.html.haml
index 13e9785317c..e9c5d51c674 100644
--- a/app/views/layouts/service_desk.html.haml
+++ b/app/views/layouts/service_desk.html.haml
@@ -24,11 +24,5 @@
         %br
         = link_to "Unsubscribe", @unsubscribe_url
 
-        -# EE-specific start
-        - if Gitlab::CurrentSettings.email_additional_text.present?
-          %br
-          %br
-            = Gitlab::Utils.nlbr(Gitlab::CurrentSettings.email_additional_text)
-        -# EE-specific end
-
+        = render_if_exists 'layouts/email_additional_text'
         = html_footer_message
diff --git a/app/views/layouts/terms.html.haml b/app/views/layouts/terms.html.haml
index 9a50e3e2eb2..29a561ae1a9 100644
--- a/app/views/layouts/terms.html.haml
+++ b/app/views/layouts/terms.html.haml
@@ -1,6 +1,7 @@
 !!! 5
 - add_page_specific_style 'page_bundles/terms'
 - @hide_top_bar = true
+- @hide_top_bar_padding = true
 - body_classes = [user_application_theme]
 %html{ lang: I18n.locale, class: page_class }
   = render "layouts/head"