Add latest changes from gitlab-org/gitlab@15-11-stable-eev15.11.0-rc42

13 files changed, 117 insertions, 102 deletions

diff --git a/app/views/admin/application_settings/_registry.html.haml b/app/views/admin/application_settings/_registry.html.haml
index 6a8ef86a56e..16b2a0b8fc6 100644
--- a/app/views/admin/application_settings/_registry.html.haml
+++ b/app/views/admin/application_settings/_registry.html.haml
@@ -6,9 +6,9 @@
       = f.label :container_registry_token_expire_delay, _('Authorization token duration (minutes)'), class: 'label-bold'
       = f.number_field :container_registry_token_expire_delay, class: 'form-control gl-form-input'
     .form-group
-      - label = _("Enable container expiration and retention policies for projects created earlier than GitLab 12.7.")
+      - label = _("Enable cleanup policies for projects created earlier than GitLab 12.7.")
       - label_link = link_to sprite_icon('question-o'), help_page_path('user/packages/container_registry/reduce_container_registry_storage', anchor: 'cleanup-policy')
-      - help_text = _("Existing projects will be able to use expiration policies. Avoid enabling this if an external Container Registry is being used, as there is a performance risk if many images exist on one project.")
+      - help_text = _("Existing projects will be able to use cleanup policies. Avoid enabling this if an external Container Registry is being used, as there is a performance risk if many images exist on one project.")
       - help_link = link_to sprite_icon('question-o'), help_page_path('user/packages/container_registry/reduce_container_registry_storage', anchor: 'use-with-external-container-registries')
       = f.gitlab_ui_checkbox_component :container_expiration_policies_enable_historic_entries,
         '%{label} %{label_link}'.html_safe % { label: label, label_link: label_link },
@@ -29,9 +29,9 @@
         .form-text.text-muted
           = _("The maximum number of tags that a single worker accepts for cleanup. If the number of tags goes above this limit, the list of tags to delete is truncated to this number. To remove this limit, set it to 0.")
       .form-group
-        - help_text = _("When enabled, cleanup polices execute faster but put more load on Redis.")
+        - help_text = _("When enabled, cleanup policies execute faster but put more load on Redis.")
         - help_link = link_to sprite_icon('question-o'), help_page_path('user/packages/container_registry/reduce_container_registry_storage', anchor: 'set-cleanup-limits-to-conserve-resources')
-        = f.gitlab_ui_checkbox_component :container_registry_expiration_policies_caching, _("Enable container expiration caching."),
+        = f.gitlab_ui_checkbox_component :container_registry_expiration_policies_caching, _("Enable cleanup policy caching."),
           help_text: '%{help_text} %{help_link}'.html_safe % { help_text: help_text, help_link: help_link }
 
   = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml
index 83347034cc5..a8d5a45041d 100644
--- a/app/views/admin/applications/_form.html.haml
+++ b/app/views/admin/applications/_form.html.haml
@@ -2,39 +2,34 @@
   = form_errors(application)
 
   = content_tag :div, class: 'form-group row' do
-    .col-sm-2.col-form-label
+    .col-12
       = f.label :name
-    .col-sm-10
-      = f.text_field :name, class: 'form-control gl-form-input'
+      = f.text_field :name, class: 'form-control gl-form-input', data: { qa_selector: 'name_field' }
       = doorkeeper_errors_for application, :name
 
   = content_tag :div, class: 'form-group row' do
-    .col-sm-2.col-form-label
+    .col-12
       = f.label :redirect_uri
-    .col-sm-10
-      = f.text_area :redirect_uri, class: 'form-control gl-form-input'
+      = f.text_area :redirect_uri, class: 'form-control gl-form-input', data: { qa_selector: 'redirect_uri_field' }
       = doorkeeper_errors_for application, :redirect_uri
       %span.form-text.text-muted
         Use one line per URI
 
   = content_tag :div, class: 'form-group row' do
-    .col-sm-2.col-form-label.pt-0
+    .col-12
       = f.label :trusted
-    .col-sm-10
-      = f.gitlab_ui_checkbox_component :trusted, _('Trusted applications are automatically authorized on GitLab OAuth flow. It\'s highly recommended for the security of users that trusted applications have the confidential setting set to true.')
+      = f.gitlab_ui_checkbox_component :trusted, _('Trusted applications are automatically authorized on GitLab OAuth flow. It\'s highly recommended for the security of users that trusted applications have the confidential setting set to true.'), checkbox_options: { data: { qa_selector: 'trusted_checkbox' } }
 
   = content_tag :div, class: 'form-group row' do
-    .col-sm-2.col-form-label.pt-0
+    .col-12
       = f.label :confidential
-    .col-sm-10
       = f.gitlab_ui_checkbox_component :confidential, _('The application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are considered non-confidential.')
 
   .form-group.row
-    .col-sm-2.col-form-label.pt-0
+    .col-12
       = f.label :scopes
-    .col-sm-10
       = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes, f: f
 
-  .form-actions
-    = f.submit _('Save application'), pajamas_button: true
+  .gl-mt-5
+    = f.submit _('Save application'), pajamas_button: true, data: { qa_selector: 'save_application_button' }
     = link_to _('Cancel'), admin_applications_path, class: "gl-button btn btn-default btn-cancel"
diff --git a/app/views/admin/applications/index.html.haml b/app/views/admin/applications/index.html.haml
index d6a0974d10f..60aa7ae1c56 100644
--- a/app/views/admin/applications/index.html.haml
+++ b/app/views/admin/applications/index.html.haml
@@ -10,16 +10,16 @@
 - if @applications.empty?
   %section.empty-state.gl-text-center.gl-display-flex.gl-flex-direction-column
     .svg-content.svg-150
-      = image_tag 'illustrations/empty-state/empty-admin-apps.svg', class: 'gl-max-w-full'
+      = image_tag 'illustrations/empty-state/empty-admin-apps-md.svg', class: 'gl-max-w-full'
 
     .gl-max-w-full.gl-m-auto
       %h1.h4.gl-font-size-h-display= s_('AdminArea|No applications found')
-      = render Pajamas::ButtonComponent.new(href: new_admin_application_path, variant: :confirm) do
+      = render Pajamas::ButtonComponent.new(href: new_admin_application_path, variant: :confirm, button_options: { data: { qa_selector: 'new_application_button' } }) do
         = s_('New application')
 
 - else
   %hr
-    = render Pajamas::ButtonComponent.new(href: new_admin_application_path, variant: :confirm) do
+    = render Pajamas::ButtonComponent.new(href: new_admin_application_path, variant: :confirm, button_options: { data: { qa_selector: 'new_application_button' } }) do
       = s_('New application')
 
   .table-responsive
diff --git a/app/views/admin/background_migrations/index.html.haml b/app/views/admin/background_migrations/index.html.haml
index 00859bf6b66..9550ea2884e 100644
--- a/app/views/admin/background_migrations/index.html.haml
+++ b/app/views/admin/background_migrations/index.html.haml
@@ -17,6 +17,9 @@
   = gl_tab_link_to admin_background_migrations_path({ tab: nil, database: params[:database] }), item_active: @current_tab == 'queued' do
     = _('Queued')
     = gl_tab_counter_badge limited_counter_with_delimiter(@relations_by_tab['queued'])
+  = gl_tab_link_to admin_background_migrations_path({ tab: 'finalizing', database: params[:database] }), item_active: @current_tab == 'finalizing' do
+    = _('Finalizing')
+    = gl_tab_counter_badge limited_counter_with_delimiter(@relations_by_tab['finalizing'])
   = gl_tab_link_to admin_background_migrations_path({ tab: 'failed', database: params[:database] }), item_active: @current_tab == 'failed' do
     = _('Failed')
     = gl_tab_counter_badge limited_counter_with_delimiter(@relations_by_tab['failed'])
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 8afddd99451..01d47facb5c 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -101,7 +101,7 @@
             doc_href: help_page_path('integration/omniauth'))
 
           = feature_entry(_('Reply by email'),
-            enabled: Gitlab::IncomingEmail.enabled?,
+            enabled: Gitlab::Email::IncomingEmail.enabled?,
             doc_href: help_page_path('administration/reply_by_email'))
 
           = render_if_exists 'admin/dashboard/elastic_and_geo'
@@ -126,7 +126,7 @@
             - if show_version_check?
               .float-right
                 .js-gitlab-version-check-badge{ data: { "size": "lg", "actionable": "true", "version": gitlab_version_check.to_json } }
-                = link_to(sprite_icon('question'), "https://gitlab.com/gitlab-org/gitlab/-/blob/master/CHANGELOG.md", class: 'gl-ml-2', target: '_blank', rel: 'noopener noreferrer')
+                = link_to(sprite_icon('question-o'), "https://gitlab.com/gitlab-org/gitlab/-/blob/master/CHANGELOG.md", class: 'gl-ml-2', target: '_blank', rel: 'noopener noreferrer')
           %p
             = link_to _('GitLab'), general_admin_application_settings_path
             %span.float-right
diff --git a/app/views/admin/dev_ops_report/show.html.haml b/app/views/admin/dev_ops_report/show.html.haml
index d92d13260fe..c079dd6b581 100644
--- a/app/views/admin/dev_ops_report/show.html.haml
+++ b/app/views/admin/dev_ops_report/show.html.haml
@@ -1,10 +1,9 @@
 - page_title _('DevOps Reports')
 - add_page_specific_style 'page_bundles/dev_ops_reports'
 
-.container
-  .gl-mt-3
-    - if show_adoption?
-      = render_if_exists 'admin/dev_ops_report/devops_tabs'
-    - else
-      = render 'score'
+.gl-mt-3
+  - if show_adoption?
+    = render_if_exists 'admin/dev_ops_report/devops_tabs'
+  - else
+    = render 'score'
 
diff --git a/app/views/admin/labels/index.html.haml b/app/views/admin/labels/index.html.haml
index 8d6df064c3c..1cdfde07adc 100644
--- a/app/views/admin/labels/index.html.haml
+++ b/app/views/admin/labels/index.html.haml
@@ -18,8 +18,8 @@
 .js-admin-labels-empty-state{ class: ('gl-display-none' if @labels.present?) }
   %section.row.empty-state.gl-text-center
     .col-12
-      .svg-content
-        = image_tag 'illustrations/labels.svg'
+      .svg-content.svg-150
+        = image_tag 'illustrations/empty-state/empty-labels-md.svg'
     .col-12
       .gl-mx-auto.gl-my-0.gl-p-5
         %h1.gl-font-size-h-display.gl-line-height-36.h4
diff --git a/app/views/admin/labels/new.html.haml b/app/views/admin/labels/new.html.haml
index 76f9eee717e..c8c3fe7b9af 100644
--- a/app/views/admin/labels/new.html.haml
+++ b/app/views/admin/labels/new.html.haml
@@ -1,5 +1,4 @@
 - page_title _("New Label")
 %h1.page-title.gl-font-size-h-display
   = _('New Label')
-%hr
 = render 'shared/labels/form', url: admin_labels_path, back_path: admin_labels_path
diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml
index 18bef523168..dbb4f3a63cc 100644
--- a/app/views/admin/projects/_form.html.haml
+++ b/app/views/admin/projects/_form.html.haml
@@ -17,6 +17,21 @@
         = f.label :description, _('Project description (optional)')
         = f.text_area :description, class: 'form-control gl-form-input gl-form-textarea gl-lg-form-input-xl', rows: 5
 
+  = render ::Layouts::HorizontalSectionComponent.new(options: { class: 'gl-pb-3 gl-mb-6' }) do |c|
+    = c.title { _('Permissions and project features') }
+    = c.description do
+      = _('Configure advanced permissions')
+    = c.body do
+      - if @project.project_setting.present?
+        .form-group.gl-form-group
+          %legend.col-form-label.col-form-label
+            = s_('Runners|Runner Registration')
+          - all_disabled = Gitlab::CurrentSettings.valid_runner_registrars.exclude?('project')
+          = f.gitlab_ui_checkbox_component :runner_registration_enabled,
+            s_('Runners|New project runners can be registered'),
+            checkbox_options: { checked: @project.runner_registration_enabled, disabled: all_disabled },
+            help_text: html_escape_once(s_('Runners|Existing runners are not affected. To permit runner registration for all projects, enable this setting in the Admin Area in Settings > CI/CD.')).html_safe
+
   .gl-mt-5
     = f.submit _('Save changes'), pajamas_button: true
     = render Pajamas::ButtonComponent.new(href: admin_project_path(@project)) do
diff --git a/app/views/admin/sessions/new.html.haml b/app/views/admin/sessions/new.html.haml
index 3950170e486..a24ef5d8ea4 100644
--- a/app/views/admin/sessions/new.html.haml
+++ b/app/views/admin/sessions/new.html.haml
@@ -1,4 +1,5 @@
 - page_title _('Enter Admin Mode')
+- add_page_specific_style 'page_bundles/login'
 
 .row.justify-content-center
   .col-md-5.new-session-forms-container
diff --git a/app/views/admin/sessions/two_factor.html.haml b/app/views/admin/sessions/two_factor.html.haml
index d05cc51af41..65455f2ccf0 100644
--- a/app/views/admin/sessions/two_factor.html.haml
+++ b/app/views/admin/sessions/two_factor.html.haml
@@ -1,4 +1,5 @@
 - page_title _('Enter 2FA for Admin Mode')
+- add_page_specific_style 'page_bundles/login'
 
 .row.justify-content-center
   .col-md-5.new-session-forms-container
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 049f3d61294..097329a027c 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -3,45 +3,46 @@
 .gl-mt-3
 .row
   .col-sm
-    .bg-light.info-well.p-3
-      %h4.page-title.d-flex
-        .gl-display-flex.gl-align-items-center.gl-justify-content-center
-          = sprite_icon('pod', size: 18, css_class: 'pod-icon gl-mr-3')
-        = _('CPU')
-      .data
-        - if @cpus
-          %h2= _('%{cores} cores') % { cores: @cpus.length }
-        - else
-          = sprite_icon('warning-solid', css_class: 'text-warning')
-          = _('Unable to collect CPU info')
-    .bg-light.info-well.p-3.gl-mt-3
-      %h4.page-title.d-flex
-        .gl-display-flex.gl-align-items-center.gl-justify-content-center
-          = sprite_icon('status-health', size: 18, css_class: 'pod-icon gl-mr-3')
-        = _('Memory Usage')
-      .data
-        - if @memory
-          %h2 #{number_to_human_size(@memory.active_bytes)} / #{number_to_human_size(@memory.total_bytes)}
-        - else
-          = sprite_icon('warning-solid', css_class: 'text-warning')
-          = _('Unable to collect memory info')
-    .bg-light.info-well.p-3.gl-mt-3
-      %h4.page-title.d-flex
-        .gl-display-flex.gl-align-items-center.gl-justify-content-center
-          = sprite_icon('clock', size: 18, css_class: 'pod-icon gl-mr-3')
-        = _('System started')
-      .data
-        %h2= time_ago_with_tooltip(Rails.application.config.booted_at)
+    = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c|
+      = c.body do
+        %h4
+          = sprite_icon('pod', size: 18, css_class: 'gl-text-gray-700')
+          = s_('CPU')
+        .data
+          - if @cpus
+            %h2= _('%{cores} cores') % { cores: @cpus.length }
+          - else
+            = sprite_icon('warning-solid', css_class: 'text-warning')
+            = _('Unable to collect CPU info')
+
+    = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c|
+      = c.body do
+        %h4
+          = sprite_icon('status-health', size: 18, css_class: 'gl-text-gray-700')
+          = s_('Memory Usage')
+        .data
+          - if @memory
+            %h2 #{number_to_human_size(@memory.active_bytes)} / #{number_to_human_size(@memory.total_bytes)}
+          - else
+            = sprite_icon('warning-solid', css_class: 'text-warning')
+            = _('Unable to collect memory info')
+
+    = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c|
+      = c.body do
+        %h4
+          = sprite_icon('clock', size: 18, css_class: 'gl-text-gray-700')
+          = s_('System started')
+        .data
+          %h2= time_ago_with_tooltip(Rails.application.config.booted_at)
   .col-sm
-    .bg-light.info-well.p-3
-      %h4.page-title.d-flex
-        .gl-display-flex.gl-align-items-center.gl-justify-content-center
-          = sprite_icon('disk', size: 18, css_class: 'pod-icon gl-mr-3')
-        = _('Disk Usage')
-      .data
-        %ul
+    = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c|
+      = c.body do
+        %h4
+          = sprite_icon('disk', size: 18, css_class: 'gl-text-gray-700')
+          = s_('Disk Usage')
+        .data
           - @disks.each do |disk|
-            %li
-              %h2 #{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])}
-              %p= disk[:disk_name]
-              %p= disk[:mount_path]
+            %h2 #{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])}
+            %ul
+              %li= disk[:disk_name]
+              %li= disk[:mount_path]
diff --git a/app/views/admin/users/_profile.html.haml b/app/views/admin/users/_profile.html.haml
index e90dab68b39..de48129dfe6 100644
--- a/app/views/admin/users/_profile.html.haml
+++ b/app/views/admin/users/_profile.html.haml
@@ -1,31 +1,32 @@
-.card
-  .card-header
+= render Pajamas::CardComponent.new(body_options: { class: 'gl-py-0' }) do |c|
+  - c.header do
     = _('Profile')
-  %ul.content-list
-    %li
-      %span.light= _('Member since')
-      %strong= user.created_at.to_s(:medium)
-    - unless user.public_email.blank?
+  - c.body do
+    %ul.content-list
       %li
-        %span.light= _('E-mail:')
-        %strong= link_to user.public_email, "mailto:#{user.public_email}"
-    - unless user.skype.blank?
-      %li
-        %span.light= _('Skype:')
-        %strong= link_to user.skype, "skype:#{user.skype}"
-    - unless user.linkedin.blank?
-      %li
-        %span.light= _('LinkedIn:')
-        %strong= link_to user.linkedin, "https://www.linkedin.com/in/#{user.linkedin}"
-    - unless user.twitter.blank?
-      %li
-        %span.light= _('Twitter:')
-        %strong= link_to user.twitter, "https://twitter.com/#{user.twitter}"
-    - unless user.website_url.blank?
-      %li
-        %span.light= _('Website:')
-        %strong= link_to user.short_website_url, user.full_website_url
-    - unless user.location.blank?
-      %li
-        %span.light= _('Location:')
-        %strong= user.location
+        %span.light= _('Member since')
+        %strong= user.created_at.to_s(:medium)
+      - unless user.public_email.blank?
+        %li
+          %span.light= _('E-mail:')
+          %strong= link_to user.public_email, "mailto:#{user.public_email}"
+      - unless user.skype.blank?
+        %li
+          %span.light= _('Skype:')
+          %strong= link_to user.skype, "skype:#{user.skype}"
+      - unless user.linkedin.blank?
+        %li
+          %span.light= _('LinkedIn:')
+          %strong= link_to user.linkedin, "https://www.linkedin.com/in/#{user.linkedin}"
+      - unless user.twitter.blank?
+        %li
+          %span.light= _('Twitter:')
+          %strong= link_to user.twitter, "https://twitter.com/#{user.twitter}"
+      - unless user.website_url.blank?
+        %li
+          %span.light= _('Website:')
+          %strong= link_to user.short_website_url, user.full_website_url
+      - unless user.location.blank?
+        %li
+          %span.light= _('Location:')
+          %strong= user.location