Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

11 files changed, 82 insertions, 31 deletions

diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 5ca4a2f9888..15cd9bece71 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -38,6 +38,7 @@
 
   = render 'layouts/startup_css', { startup_filename: local_assigns.fetch(:startup_filename, nil) }
   - if user_application_theme == 'gl-dark'
+    %meta{ name: 'color-scheme', content: 'dark light' }
     = stylesheet_link_tag_defer "application_dark"
     = yield :page_specific_styles
     = stylesheet_link_tag_defer "application_utilities_dark"
@@ -56,7 +57,7 @@
 
   = Gon::Base.render_data(nonce: content_security_policy_nonce)
 
-  = javascript_include_tag locale_path unless I18n.locale == :en
+  = render_if_exists 'layouts/header/translations'
   = webpack_bundle_tag "sentry" if Gitlab.config.sentry.enabled
   = webpack_bundle_tag 'performance_bar' if performance_bar_enabled?
 
diff --git a/app/views/layouts/_header_search.html.haml b/app/views/layouts/_header_search.html.haml
new file mode 100644
index 00000000000..d2fe9a9a6ee
--- /dev/null
+++ b/app/views/layouts/_header_search.html.haml
@@ -0,0 +1,24 @@
+#js-header-search.header-search{ data: { 'search-context' => header_search_context.to_json,
+'search-path' => search_path,
+'issues-path' => issues_dashboard_path,
+'mr-path' => merge_requests_dashboard_path,
+'autocomplete-path' => search_autocomplete_path } }
+  = form_tag search_path, method: :get do |_f|
+    .gl-search-box-by-type
+      = sprite_icon('search', css_class: 'gl-search-box-by-type-search-icon gl-icon')
+      %input{ id: 'search', name: 'search', type: "text", placeholder: s_('GlobalSearch|Search GitLab'), class: 'form-control gl-form-input gl-search-box-by-type-input', autocomplete: 'off' }
+
+    = hidden_field_tag :group_id, header_search_context[:group][:id] if header_search_context[:group]
+    = hidden_field_tag :project_id, header_search_context[:project][:id] if header_search_context[:project]
+
+    - if header_search_context[:group] || header_search_context[:project]
+      = hidden_field_tag :scope, header_search_context[:scope]
+      = hidden_field_tag :search_code, header_search_context[:code_search]
+
+    = hidden_field_tag :snippets, header_search_context[:for_snippets]
+    = hidden_field_tag :repository_ref, header_search_context[:ref]
+    = hidden_field_tag :nav_source, 'navbar'
+
+    -# workaround for non-JS feature specs, see spec/support/helpers/search_helpers.rb
+    - if ENV['RAILS_ENV'] == 'test'
+      %noscript= button_tag 'Search'
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index b7299df1bc1..a656b61dc8f 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -3,23 +3,22 @@
     = render "layouts/nav/sidebar/#{nav}"
   .content-wrapper.content-wrapper-margin{ class: "#{@content_wrapper_class}" }
     .mobile-overlay
-    = render_if_exists 'layouts/header/verification_reminder'
+    = dispensable_render_if_exists 'layouts/header/verification_reminder'
     .alert-wrapper.gl-force-block-formatting-context
-      = render 'shared/outdated_browser'
-      = render_if_exists "layouts/header/licensed_user_count_threshold"
-      = render_if_exists "layouts/header/token_expiry_notification"
-      = render "layouts/broadcast"
-      = render "layouts/header/read_only_banner"
-      = render "layouts/header/registration_enabled_callout"
-      = render "layouts/nav/classification_level_banner"
+      = 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 "layouts/broadcast"
+      = dispensable_render "layouts/header/read_only_banner"
+      = dispensable_render "layouts/header/registration_enabled_callout"
+      = dispensable_render "layouts/nav/classification_level_banner"
       = yield :flash_message
-      = render "shared/service_ping_consent"
-      = render_two_factor_auth_recovery_settings_check
-      = render_if_exists "layouts/header/ee_subscribable_banner"
-      = render_if_exists "layouts/header/seats_count_alert"
-      = render_if_exists "shared/namespace_storage_limit_alert"
-      = render_if_exists "shared/namespace_user_cap_reached_alert"
-      = render_if_exists "shared/new_user_signups_cap_reached_alert"
+      = 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 "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 :group_invite_members_banner
       - unless @hide_breadcrumbs
diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index 58fed89dfe7..940724e0e4a 100644
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
@@ -6,6 +6,9 @@
 - display_namespace_storage_limit_alert!
 - @left_sidebar = true
 
+- content_for :flash_message do
+  = render "layouts/header/storage_enforcement_banner", namespace: @group
+
 - content_for :page_specific_javascripts do
   - if current_user
     = javascript_tag do
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 871d1213c0e..512a4185bee 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -38,17 +38,10 @@
             = render 'layouts/header/new_dropdown', class: 'gl-display-none gl-sm-display-block'
           - if top_nav_show_search
             - search_menu_item = top_nav_search_menu_item_attrs
-            %li.nav-item.d-none.d-lg-block.m-auto
+            %li.nav-item.header-search-new.d-none.d-lg-block.m-auto
               - unless current_controller?(:search)
                 - if Feature.enabled?(:new_header_search)
-                  #js-header-search.header-search{ data: { 'search-context' => header_search_context.to_json,
-                  'search-path' => search_path,
-                  'issues-path' => issues_dashboard_path,
-                  'mr-path' => merge_requests_dashboard_path,
-                  'autocomplete-path' => search_autocomplete_path } }
-                    .gl-search-box-by-type
-                      = sprite_icon('search', css_class: 'gl-search-box-by-type-search-icon gl-icon')
-                      %input{ type: "text", placeholder: s_('GlobalSearch|Search GitLab'), class: 'form-control gl-form-input gl-search-box-by-type-input', id: 'search', autocomplete: 'off' }
+                  = render 'layouts/header_search'
                 - else
                   = render 'layouts/search'
             %li.nav-item{ class: 'd-none d-sm-inline-block d-lg-none' }
@@ -68,7 +61,8 @@
                   = number_with_delimiter(issues_count)
           - if header_link?(:merge_requests)
             = nav_link(path: 'dashboard#merge_requests', html_options: { class: "user-counter dropdown" }) do
-              = link_to assigned_mrs_dashboard_path, class: 'dashboard-shortcuts-merge_requests', title: _('Merge requests'), aria: { label: _('Merge requests') },
+              - top_level_link = Feature.enabled?(:mr_attention_requests, default_enabled: :yaml) ? attention_requested_mrs_dashboard_path : assigned_mrs_dashboard_path
+              = link_to top_level_link, class: 'dashboard-shortcuts-merge_requests', title: _('Merge requests'), aria: { label: _('Merge requests') },
                 data: { qa_selector: 'merge_requests_shortcut_button',
                 toggle: "dropdown",
                 placement: 'bottom',
@@ -84,6 +78,13 @@
                 %ul
                   %li.dropdown-header
                     = _('Merge requests')
+                  - if Feature.enabled?(:mr_attention_requests, default_enabled: :yaml)
+                    %li#js-need-attention-nav
+                      #js-need-attention-nav-onboarding
+                      = link_to attention_requested_mrs_dashboard_path, class: 'gl-display-flex! gl-align-items-center js-prefetch-document' do
+                        = _('Need your attention')
+                        = gl_badge_tag user_merge_requests_counts[:attention_requested_count], { size: :sm, variant: user_merge_requests_counts[:attention_requested_count] == 0 ? :neutral : :warning }, { class: 'merge-request-badge gl-ml-auto js-attention-count' }
+                    %li.divider
                   %li
                     = link_to assigned_mrs_dashboard_path, class: 'gl-display-flex! gl-align-items-center js-prefetch-document' do
                       = _('Assigned to you')
diff --git a/app/views/layouts/header/_registration_enabled_callout.html.haml b/app/views/layouts/header/_registration_enabled_callout.html.haml
index 90f3ac61614..d1d23c86c81 100644
--- a/app/views/layouts/header/_registration_enabled_callout.html.haml
+++ b/app/views/layouts/header/_registration_enabled_callout.html.haml
@@ -1,14 +1,17 @@
 - return unless show_registration_enabled_user_callout?
 
 = render 'shared/global_alert',
-  title: _('Open registration is enabled on your instance.'),
+  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
   .gl-alert-body
-    = html_escape(_('%{anchorOpen}Learn more%{anchorClose} about how you can customize / disable registration on your instance.')) % { anchorOpen: "<a href=\"#{help_page_path('user/admin_area/settings/sign_up_restrictions')}\" class=\"gl-link\">".html_safe, anchorClose: '</a>'.html_safe }
+    = _('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.')
   .gl-alert-actions
     = link_to general_admin_application_settings_path(anchor: 'js-signup-settings'), class: 'btn gl-alert-action btn-confirm btn-md gl-button' do
       %span.gl-button-text
-        = _('View setting')
+        = _('Turn off')
+    %button.btn.gl-alert-action.btn-default.btn-md.gl-button.js-close
+      %span.gl-button-text
+        = _('Acknowledge')
diff --git a/app/views/layouts/header/_storage_enforcement_banner.html.haml b/app/views/layouts/header/_storage_enforcement_banner.html.haml
new file mode 100644
index 00000000000..851fc57e44d
--- /dev/null
+++ b/app/views/layouts/header/_storage_enforcement_banner.html.haml
@@ -0,0 +1,9 @@
+- return unless current_user
+- namespace = local_assigns.fetch(:namespace)
+- banner_info = storage_enforcement_banner_info(namespace)
+- return unless banner_info.present?
+
+= render 'shared/global_alert', 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
+  .gl-alert-body
+    = banner_info[:text]
+    = banner_info[:learn_more_link]
diff --git a/app/views/layouts/header/_translations.html.haml b/app/views/layouts/header/_translations.html.haml
new file mode 100644
index 00000000000..979f39ad3e0
--- /dev/null
+++ b/app/views/layouts/header/_translations.html.haml
@@ -0,0 +1 @@
+= javascript_include_tag locale_path unless I18n.locale == :en
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index e922b505be8..3b979f69cac 100644
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -3,7 +3,10 @@
     %meta{ content: "text/html; charset=utf-8", "http-equiv" => "Content-Type" }
     %title
       GitLab
-    = stylesheet_link_tag 'notify'
+    - if Feature.enabled?(:enhanced_notify_css)
+      = stylesheet_link_tag 'notify_enhanced'
+    - else
+      = stylesheet_link_tag 'notify'
     = yield :head
   %body
     .content
diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index 17153e72e6e..322a77116c8 100644
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -5,4 +5,8 @@
 - @left_sidebar = true
 
 - enable_search_settings locals: { container_class: 'gl-my-5' }
+
+- content_for :flash_message do
+  = render "layouts/header/storage_enforcement_banner", namespace: current_user.namespace
+
 = render template: "layouts/application"
diff --git a/app/views/layouts/service_desk.html.haml b/app/views/layouts/service_desk.html.haml
index 26d15a74403..a838ba91d26 100644
--- a/app/views/layouts/service_desk.html.haml
+++ b/app/views/layouts/service_desk.html.haml
@@ -5,7 +5,10 @@
     %title
       GitLab
     -# haml-lint:enable NoPlainNodes
-    = stylesheet_link_tag 'notify'
+    - if Feature.enabled?(:enhanced_notify_css)
+      = stylesheet_link_tag 'notify_enhanced'
+    - else
+      = stylesheet_link_tag 'notify'
     = yield :head
   %body
     .content