Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

11 files changed, 42 insertions, 32 deletions

diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 55c66454d0b..84eb2706929 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -68,6 +68,7 @@
 
   %meta{ name: "description", content: page_description }
 
+  %link{ rel: 'manifest', href: manifest_path(format: :json) }
   %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1' }
   %meta{ name: 'theme-color', content: user_theme_primary_color }
 
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 3c4b612f33f..b7cf7b7468f 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -8,6 +8,7 @@
       = dispensable_render 'shared/outdated_browser'
       = dispensable_render_if_exists "layouts/header/licensed_user_count_threshold"
       = dispensable_render_if_exists "layouts/header/token_expiry_notification"
+      = dispensable_render "shared/projects/inactive_project_deletion_alert"
       = dispensable_render "layouts/broadcast"
       = dispensable_render "layouts/header/read_only_banner"
       = dispensable_render "layouts/header/registration_enabled_callout"
@@ -15,12 +16,12 @@
       = yield :flash_message
       = dispensable_render "shared/service_ping_consent"
       = dispensable_render_if_exists "layouts/header/ee_subscribable_banner"
-      = dispensable_render_if_exists "layouts/header/seats_count_alert"
+      = dispensable_render_if_exists "layouts/header/seat_count_alert"
       = dispensable_render_if_exists "shared/namespace_storage_limit_alert"
       = dispensable_render_if_exists "shared/namespace_user_cap_reached_alert"
       = dispensable_render_if_exists "shared/new_user_signups_cap_reached_alert"
       = yield :page_level_alert
-      = yield :user_over_limit_free_plan_alert
+      = yield :free_user_cap_alert
       = yield :group_invite_members_banner
       - unless @hide_breadcrumbs
         = render "layouts/nav/breadcrumbs"
diff --git a/app/views/layouts/_visual_review.html.haml b/app/views/layouts/_visual_review.html.haml
new file mode 100644
index 00000000000..73da841964a
--- /dev/null
+++ b/app/views/layouts/_visual_review.html.haml
@@ -0,0 +1 @@
+= javascript_tag "", visual_review_toolbar_options
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index bdab5d7ea07..455d18a5ae8 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -8,6 +8,7 @@
   %body{ class: body_classes, data: body_data }
     = render "layouts/init_auto_complete" if @gfm_form
     = render "layouts/init_client_detection_flags"
+    = render "layouts/visual_review" if ENV['REVIEW_APPS_ENABLED']
     = render 'peek/bar'
     = header_message
     = render partial: "layouts/header/default", locals: { project: @project, group: @group }
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 3cae8186750..911cb85de53 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -6,13 +6,10 @@
   .container-fluid
     .header-content.js-header-content
       .title-container.hide-when-top-nav-responsive-open.gl-transition-medium.gl-display-flex.gl-align-items-stretch.gl-pt-0
-        %h1.title
+        .title
           %span.gl-sr-only GitLab
           = link_to root_path, title: _('Dashboard'), id: 'logo', **tracking_attrs('main_navigation', 'click_gitlab_logo_link', 'navigation') do
-            %span{ :class => "gl-display-none gl-lg-display-flex" }
-              = brand_header_logo({add_gitlab_white_text: true})
-            %span{ :class => "gl-lg-display-none! gl-display-flex" }
-              = brand_header_logo
+            = brand_header_logo
           - if Gitlab.com_and_canary?
             = link_to Gitlab::Saas.canary_toggle_com_url, class: 'canary-badge bg-transparent', data: { qa_selector: 'canary_badge_link' }, target: :_blank, rel: 'noopener noreferrer' do
               = gl_badge_tag({ variant: :success, size: :sm }) do
@@ -32,12 +29,12 @@
                 = render "layouts/nav/top_nav"
 
       .navbar-collapse.gl-transition-medium.collapse
-        %ul.nav.navbar-nav.gl-w-full
+        %ul.nav.navbar-nav.gl-w-full.gl-align-items-center.gl-justify-content-end
           - if current_user
             = render 'layouts/header/new_dropdown', class: 'gl-display-none gl-sm-display-block gl-white-space-nowrap gl-text-right'
           - if top_nav_show_search
             - search_menu_item = top_nav_search_menu_item_attrs
-            %li.nav-item.header-search-new.gl-display-none.gl-lg-display-block.m-auto.gl-w-full
+            %li.nav-item.header-search-new.gl-display-none.gl-lg-display-block.gl-w-full
               - unless current_controller?(:search)
                 - if Feature.enabled?(:new_header_search)
                   = render 'layouts/header_search'
diff --git a/app/views/layouts/header/_registration_enabled_callout.html.haml b/app/views/layouts/header/_registration_enabled_callout.html.haml
index 03e961bda8f..dd3d14a5678 100644
--- a/app/views/layouts/header/_registration_enabled_callout.html.haml
+++ b/app/views/layouts/header/_registration_enabled_callout.html.haml
@@ -2,10 +2,10 @@
 
 = render Pajamas::AlertComponent.new(title: _('Anyone can register for an account.'),
   variant: :warning,
-  alert_class: 'js-registration-enabled-callout',
-  alert_data: { feature_id: Users::CalloutsHelper::REGISTRATION_ENABLED_CALLOUT,
-                dismiss_endpoint: callouts_path },
-  close_button_data: { testid: 'close-registration-enabled-callout' }) do |c|
+  alert_options: { class: 'js-registration-enabled-callout',
+                   data: { feature_id: Users::CalloutsHelper::REGISTRATION_ENABLED_CALLOUT,
+                           dismiss_endpoint: callouts_path }},
+  close_button_options: { data: { testid: 'close-registration-enabled-callout' }}) do |c|
   = c.body do
     = _('Only allow anyone to register for accounts on GitLab instances that you intend to be used by anyone. Allowing anyone to register makes GitLab instances more vulnerable.')
   = c.actions do
diff --git a/app/views/layouts/header/_storage_enforcement_banner.html.haml b/app/views/layouts/header/_storage_enforcement_banner.html.haml
index 6613130fdf3..c117f22a402 100644
--- a/app/views/layouts/header/_storage_enforcement_banner.html.haml
+++ b/app/views/layouts/header/_storage_enforcement_banner.html.haml
@@ -4,11 +4,11 @@
 - return unless banner_info.present?
 
 = render Pajamas::AlertComponent.new(variant: :warning,
-  alert_class: 'js-storage-enforcement-banner',
-  alert_data: { feature_id: banner_info[:callouts_feature_name],
-                dismiss_endpoint: banner_info[:callouts_path],
-                group_id: namespace.id,
-                defer_links: "true" }) do |c|
+  alert_options: { class: 'js-storage-enforcement-banner',
+                   data: { feature_id: banner_info[:callouts_feature_name],
+                           dismiss_endpoint: banner_info[:callouts_path],
+                           group_id: namespace.id,
+                           defer_links: "true" }}) do |c|
   = c.body do
     = banner_info[:text]
     = banner_info[:learn_more_link]
diff --git a/app/views/layouts/nav/breadcrumbs/_collapsed_inline_list.html.haml b/app/views/layouts/nav/breadcrumbs/_collapsed_inline_list.html.haml
index ccb660c050e..dd2d23320be 100644
--- a/app/views/layouts/nav/breadcrumbs/_collapsed_inline_list.html.haml
+++ b/app/views/layouts/nav/breadcrumbs/_collapsed_inline_list.html.haml
@@ -4,8 +4,8 @@
   %li.expander
     %button.text-expander.has-tooltip.js-breadcrumbs-collapsed-expander{ type: "button", data: { container: "body" }, "aria-label": button_tooltip, title: button_tooltip }
       = sprite_icon("ellipsis_h", size: 12)
-    = sprite_icon("angle-right", size: 8, css_class: "breadcrumbs-list-angle")
+    = sprite_icon("chevron-lg-right", size: 8, css_class: "breadcrumbs-list-angle")
   - @breadcrumb_collapsed_links[dropdown_location].each_with_index do |link, index|
     %li{ :class => "gl-display-none! breadcrumbs-detail-item" }
       = link
-      = sprite_icon("angle-right", size: 8, css_class: "breadcrumbs-list-angle")
+      = sprite_icon("chevron-lg-right", size: 8, css_class: "breadcrumbs-list-angle")
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index 3b979f69cac..d9f16a89fbc 100644
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -5,6 +5,10 @@
       GitLab
     - if Feature.enabled?(:enhanced_notify_css)
       = stylesheet_link_tag 'notify_enhanced'
+      %style{ type: 'text/css', 'data-premailer': 'ignore' }
+        -# The MUA automatically turns some text into links.
+        -# Match the color of explicit links ($blue-600 from typography.scss).
+        a { color: #1068bf; }
     - else
       = stylesheet_link_tag 'notify'
     = yield :head
diff --git a/app/views/layouts/service_desk.html.haml b/app/views/layouts/service_desk.html.haml
index a838ba91d26..bab7bc6b9da 100644
--- a/app/views/layouts/service_desk.html.haml
+++ b/app/views/layouts/service_desk.html.haml
@@ -7,6 +7,10 @@
     -# haml-lint:enable NoPlainNodes
     - if Feature.enabled?(:enhanced_notify_css)
       = stylesheet_link_tag 'notify_enhanced'
+      %style{ type: 'text/css', 'data-premailer': 'ignore' }
+        -# The MUA automatically turns some text into links.
+        -# Match the color of explicit links ($blue-600 from typography.scss).
+        a { color: #1068bf; }
     - else
       = stylesheet_link_tag 'notify'
     = yield :head
diff --git a/app/views/layouts/terms.html.haml b/app/views/layouts/terms.html.haml
index 91301e1e226..c9baf0cd2b8 100644
--- a/app/views/layouts/terms.html.haml
+++ b/app/views/layouts/terms.html.haml
@@ -16,16 +16,17 @@
 
         %div{ class: "#{container_class} limit-container-width" }
           .content{ id: "content-body" }
-            .gl-card
-              .gl-card-header
+            = render Pajamas::CardComponent.new do |c|
+              = c.header do
                 = brand_header_logo({add_gitlab_black_text: true})
-              - if header_link?(:user_dropdown)
-                .navbar-collapse
-                  %ul.nav.navbar-nav
-                    %li.header-user.dropdown
-                      = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
-                        = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar", data: { qa_selector: 'user_avatar' }
-                        = sprite_icon('angle-down', css_class: 'caret-down')
-                      .dropdown-menu.dropdown-menu-right
-                        = render 'layouts/header/current_user_dropdown'
-              = yield
+              = c.body do
+                - if header_link?(:user_dropdown)
+                  .navbar-collapse
+                    %ul.nav.navbar-nav
+                      %li.header-user.dropdown
+                        = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
+                          = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar", data: { qa_selector: 'user_avatar' }
+                          = sprite_icon('chevron-down')
+                        .dropdown-menu.dropdown-menu-right
+                          = render 'layouts/header/current_user_dropdown'
+                = yield