Add latest changes from gitlab-org/gitlab@master

19 files changed, 46 insertions, 32 deletions

diff --git a/app/assets/javascripts/behaviors/index.js b/app/assets/javascripts/behaviors/index.js
index fd12c282b62..613309a1c5a 100644
--- a/app/assets/javascripts/behaviors/index.js
+++ b/app/assets/javascripts/behaviors/index.js
@@ -13,6 +13,9 @@ import './toggler_behavior';
 import './preview_markdown';
 import initCollapseSidebarOnWindowResize from './collapse_sidebar_on_window_resize';
 import initSelect2Dropdowns from './select2';
+import { loadStartupCSS } from './load_startup_css';
+
+loadStartupCSS();
 
 installGlEmojiElement();
 
diff --git a/app/assets/javascripts/behaviors/load_startup_css.js b/app/assets/javascripts/behaviors/load_startup_css.js
new file mode 100644
index 00000000000..1d7bf716475
--- /dev/null
+++ b/app/assets/javascripts/behaviors/load_startup_css.js
@@ -0,0 +1,15 @@
+export const loadStartupCSS = () => {
+  // We need to fallback to dispatching `load` in case our event listener was added too late
+  // or the browser environment doesn't load media=print.
+  // Do this on `window.load` so that the default deferred behavior takes precedence.
+  // https://gitlab.com/gitlab-org/gitlab/-/issues/239357
+  window.addEventListener(
+    'load',
+    () => {
+      document
+        .querySelectorAll('link[media=print]')
+        .forEach(x => x.dispatchEvent(new Event('load')));
+    },
+    { once: true },
+  );
+};
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 73f71f7ad55..c05153921fe 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -2,6 +2,7 @@
 
 class Admin::ApplicationSettingsController < Admin::ApplicationController
   include InternalRedirect
+  include ServicesHelper
 
   # NOTE: Use @application_setting in this controller when you need to access
   # application_settings after it has been modified. This is because the
@@ -32,6 +33,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   end
 
   def integrations
+    return not_found unless instance_level_integrations?
+
     @integrations = Service.find_or_initialize_all(Service.for_instance).sort_by(&:title)
   end
 
diff --git a/app/controllers/admin/integrations_controller.rb b/app/controllers/admin/integrations_controller.rb
index 1e2a99f7078..003a5d427f5 100644
--- a/app/controllers/admin/integrations_controller.rb
+++ b/app/controllers/admin/integrations_controller.rb
@@ -2,6 +2,7 @@
 
 class Admin::IntegrationsController < Admin::ApplicationController
   include IntegrationsActions
+  include ServicesHelper
 
   private
 
@@ -10,7 +11,7 @@ class Admin::IntegrationsController < Admin::ApplicationController
   end
 
   def integrations_enabled?
-    true
+    instance_level_integrations?
   end
 
   def scoped_edit_integration_path(integration)
diff --git a/app/controllers/concerns/integrations_actions.rb b/app/controllers/concerns/integrations_actions.rb
index 6060dc729af..39f63bbaaec 100644
--- a/app/controllers/concerns/integrations_actions.rb
+++ b/app/controllers/concerns/integrations_actions.rb
@@ -20,7 +20,7 @@ module IntegrationsActions
     respond_to do |format|
       format.html do
         if saved
-          PropagateIntegrationWorker.perform_async(integration.id, false)
+          PropagateIntegrationWorker.perform_async(integration.id)
           redirect_to scoped_edit_integration_path(integration), notice: success_message
         else
           render 'shared/integrations/edit'
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb
index 2c406641882..9bf819febb0 100644
--- a/app/helpers/preferences_helper.rb
+++ b/app/helpers/preferences_helper.rb
@@ -61,8 +61,8 @@ module PreferencesHelper
     @user_application_theme ||= Gitlab::Themes.for_user(current_user).css_class
   end
 
-  def user_application_theme_name
-    @user_application_theme_name ||= Gitlab::Themes.for_user(current_user).name.downcase.tr(' ', '_')
+  def user_application_theme_css_filename
+    @user_application_theme_css_filename ||= Gitlab::Themes.for_user(current_user).css_filename
   end
 
   def user_color_scheme
diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb
index 6b5de73a831..ae59f84e7da 100644
--- a/app/helpers/services_helper.rb
+++ b/app/helpers/services_helper.rb
@@ -124,6 +124,10 @@ module ServicesHelper
     @group.present? && Feature.enabled?(:group_level_integrations, @group)
   end
 
+  def instance_level_integrations?
+    !Gitlab.com?
+  end
+
   extend self
 
   private
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 47eba685afe..7e9e24b2418 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -875,7 +875,7 @@ module Ci
     end
 
     def builds_with_coverage
-      builds.with_coverage
+      builds.latest.with_coverage
     end
 
     def has_reports?(reports_scope)
diff --git a/app/serializers/merge_request_poll_widget_entity.rb b/app/serializers/merge_request_poll_widget_entity.rb
index 41ab5005091..462fdcb8c4d 100644
--- a/app/serializers/merge_request_poll_widget_entity.rb
+++ b/app/serializers/merge_request_poll_widget_entity.rb
@@ -20,19 +20,11 @@ class MergeRequestPollWidgetEntity < Grape::Entity
   expose :merge_user, using: UserEntity
 
   expose :actual_head_pipeline, as: :pipeline, if: -> (mr, _) { presenter(mr).can_read_pipeline? } do |merge_request, options|
-    if Feature.enabled?(:merge_request_short_pipeline_serializer, merge_request.project, default_enabled: true)
-      MergeRequests::PipelineEntity.represent(merge_request.actual_head_pipeline, options)
-    else
-      PipelineDetailsEntity.represent(merge_request.actual_head_pipeline, options)
-    end
+    MergeRequests::PipelineEntity.represent(merge_request.actual_head_pipeline, options)
   end
 
   expose :merge_pipeline, if: ->(mr, _) { mr.merged? && can?(request.current_user, :read_pipeline, mr.target_project)} do |merge_request, options|
-    if Feature.enabled?(:merge_request_short_pipeline_serializer, merge_request.project, default_enabled: true)
-      MergeRequests::PipelineEntity.represent(merge_request.merge_pipeline, options)
-    else
-      PipelineDetailsEntity.represent(merge_request.merge_pipeline, options)
-    end
+    MergeRequests::PipelineEntity.represent(merge_request.merge_pipeline, options)
   end
 
   expose :default_merge_commit_message
diff --git a/app/views/admin/dashboard/_billable_users_text.html.haml b/app/views/admin/dashboard/_billable_users_text.html.haml
new file mode 100644
index 00000000000..e9485d23228
--- /dev/null
+++ b/app/views/admin/dashboard/_billable_users_text.html.haml
@@ -0,0 +1 @@
+= s_('AdminArea|Active users')
diff --git a/app/views/admin/dashboard/stats.html.haml b/app/views/admin/dashboard/stats.html.haml
index 78707235cb5..9a89bf12365 100644
--- a/app/views/admin/dashboard/stats.html.haml
+++ b/app/views/admin/dashboard/stats.html.haml
@@ -50,11 +50,9 @@
       = s_('AdminArea|Bots')
     %td.p-3.text-right
       = @users_statistics&.bots.to_i
-
   %tr.bg-gray-light.gl-text-gray-900
     %td.p-3
       %strong
-        = s_('AdminArea|Active users')
         = render_if_exists 'admin/dashboard/billable_users_text'
     %td.p-3.text-right
       %strong
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index b741e6d5381..8c7c7024f9f 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -53,7 +53,7 @@
   - else
     = stylesheet_link_tag_defer "application"
   - unless use_startup_css?
-    = stylesheet_link_tag_defer "themes/theme_#{user_application_theme_name}"
+    = stylesheet_link_tag_defer "themes/#{user_application_theme_css_filename}" if user_application_theme_css_filename
   = 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?
 
diff --git a/app/views/layouts/_startup_css.haml b/app/views/layouts/_startup_css.haml
index ea05157ed19..2f674f79b2f 100644
--- a/app/views/layouts/_startup_css.haml
+++ b/app/views/layouts/_startup_css.haml
@@ -3,5 +3,5 @@
 - startup_filename = current_path?("sessions#new") ? 'signin' : user_application_theme == 'gl-dark' ? 'dark' : 'general'
 
 %style{ type: "text/css" }
-  = Rails.application.assets_manifest.find_sources("themes/theme_#{user_application_theme_name}.css").first.to_s.html_safe
+  = Rails.application.assets_manifest.find_sources("themes/#{user_application_theme_css_filename}.css").first.to_s.html_safe if user_application_theme_css_filename
   = Rails.application.assets_manifest.find_sources("startup/startup-#{startup_filename}.css").first.to_s.html_safe
diff --git a/app/views/layouts/_startup_css_activation.haml b/app/views/layouts/_startup_css_activation.haml
index 022b9a695bc..a426d686c34 100644
--- a/app/views/layouts/_startup_css_activation.haml
+++ b/app/views/layouts/_startup_css_activation.haml
@@ -7,4 +7,3 @@
       const startupLinkLoadedEvent = new CustomEvent('CSSStartupLinkLoaded');
       linkTag.addEventListener('load',function(){this.media='all';this.setAttribute('data-startupcss', 'loaded');document.dispatchEvent(startupLinkLoadedEvent);},{once: true});
     })
-- return unless use_startup_css?
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml
index cb5277c02f0..0da4d4f7ddd 100644
--- a/app/views/layouts/nav/sidebar/_admin.html.haml
+++ b/app/views/layouts/nav/sidebar/_admin.html.haml
@@ -260,10 +260,11 @@
               = link_to general_admin_application_settings_path, title: _('General'), class: 'qa-admin-settings-general-item' do
                 %span
                   = _('General')
-            = nav_link(path: ['application_settings#integrations', 'integrations#edit']) do
-              = link_to integrations_admin_application_settings_path, title: _('Integrations'), data: { qa_selector: 'integration_settings_link' } do
-                %span
-                  = _('Integrations')
+            - if instance_level_integrations?
+              = nav_link(path: ['application_settings#integrations', 'integrations#edit']) do
+                = link_to integrations_admin_application_settings_path, title: _('Integrations'), data: { qa_selector: 'integration_settings_link' } do
+                  %span
+                    = _('Integrations')
             = nav_link(path: 'application_settings#repository') do
               = link_to repository_admin_application_settings_path, title: _('Repository'), class: 'qa-admin-settings-repository-item' do
                 %span
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index 2c705886f47..ea1126fb30f 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -2,7 +2,7 @@
 - @content_class = "limit-container-width" unless fluid_layout
 
 - Gitlab::Themes.each do |theme|
-  = stylesheet_link_tag "themes/theme_#{theme.css_class.gsub('ui-', '')}"
+  = stylesheet_link_tag "themes/#{theme.css_filename}" if theme.css_filename
 
 = form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row gl-mt-3 js-preferences-form' } do |f|
   .col-lg-4.application-theme#navigation-theme
diff --git a/app/workers/authorized_project_update/periodic_recalculate_worker.rb b/app/workers/authorized_project_update/periodic_recalculate_worker.rb
index 0d1ad67d7bb..78ffdbca4d6 100644
--- a/app/workers/authorized_project_update/periodic_recalculate_worker.rb
+++ b/app/workers/authorized_project_update/periodic_recalculate_worker.rb
@@ -12,9 +12,7 @@ module AuthorizedProjectUpdate
     idempotent!
 
     def perform
-      if ::Feature.enabled?(:periodic_project_authorization_recalculation, default_enabled: true)
-        AuthorizedProjectUpdate::PeriodicRecalculateService.new.execute
-      end
+      AuthorizedProjectUpdate::PeriodicRecalculateService.new.execute
     end
   end
 end
diff --git a/app/workers/authorized_project_update/user_refresh_over_user_range_worker.rb b/app/workers/authorized_project_update/user_refresh_over_user_range_worker.rb
index 336b1c5443e..9bd1ad2ed30 100644
--- a/app/workers/authorized_project_update/user_refresh_over_user_range_worker.rb
+++ b/app/workers/authorized_project_update/user_refresh_over_user_range_worker.rb
@@ -12,9 +12,7 @@ module AuthorizedProjectUpdate
     idempotent!
 
     def perform(start_user_id, end_user_id)
-      if ::Feature.enabled?(:periodic_project_authorization_recalculation, default_enabled: true)
-        AuthorizedProjectUpdate::RecalculateForUserRangeService.new(start_user_id, end_user_id).execute
-      end
+      AuthorizedProjectUpdate::RecalculateForUserRangeService.new(start_user_id, end_user_id).execute
     end
   end
 end
diff --git a/app/workers/propagate_integration_worker.rb b/app/workers/propagate_integration_worker.rb
index 68e38386372..bb954b12a25 100644
--- a/app/workers/propagate_integration_worker.rb
+++ b/app/workers/propagate_integration_worker.rb
@@ -7,7 +7,8 @@ class PropagateIntegrationWorker
   idempotent!
   loggable_arguments 1
 
-  # Keep overwrite parameter for backwards compatibility.
+  # TODO: Keep overwrite parameter for backwards compatibility. Remove after >= 14.0
+  # https://gitlab.com/gitlab-org/gitlab/-/issues/255382
   def perform(integration_id, overwrite = nil)
     Admin::PropagateIntegrationService.propagate(Service.find(integration_id))
   end