Add latest changes from gitlab-org/gitlab@master

app/workers/project_cache_worker.rb

@@ -3,6 +3,9 @@
 # Worker for updating any project specific caches.
 class ProjectCacheWorker
   include ApplicationWorker
+
+  latency_sensitive_worker!
+
   LEASE_TIMEOUT = 15.minutes.to_i
   feature_category :source_code_management

app/workers/project_export_worker.rb

@@ -6,6 +6,7 @@ class ProjectExportWorker
   sidekiq_options retry: 3
   feature_category :source_code_management
+  worker_resource_boundary :memory
   def perform(current_user_id, project_id, after_export_strategy = {}, params = {})
     current_user = User.find(current_user_id)

app/workers/project_service_worker.rb

@@ -5,6 +5,7 @@ class ProjectServiceWorker
   sidekiq_options dead: false
   feature_category :integrations
+  worker_has_external_dependencies!
   def perform(hook_id, data)
     data = data.with_indifferent_access

app/workers/reactive_caching_worker.rb

@@ -5,6 +5,14 @@ class ReactiveCachingWorker
   feature_category_not_owned!
+  # TODO: The reactive caching worker should be split into
+  # two different workers, one for latency_sensitive jobs without external dependencies
+  # and another worker without latency_sensitivity, but with external dependencies
+  # https://gitlab.com/gitlab-com/gl-infra/scalability/issues/34
+  # This worker should also have `worker_has_external_dependencies!` enabled
+  latency_sensitive_worker!
+  worker_resource_boundary :cpu
+
   def perform(class_name, id, *args)
     klass = begin
       class_name.constantize

app/workers/remove_expired_members_worker.rb

@@ -5,6 +5,7 @@ class RemoveExpiredMembersWorker
   include CronjobQueue
   feature_category :authentication_and_authorization
+  worker_resource_boundary :cpu
   def perform
     Member.expired.find_each do |member|

app/workers/repository_import_worker.rb

@@ -7,6 +7,7 @@ class RepositoryImportWorker
   include ProjectImportOptions
   feature_category :importers
+  worker_has_external_dependencies!
   # technical debt: https://gitlab.com/gitlab-org/gitlab/issues/33991
   sidekiq_options memory_killer_memory_growth_kb: ENV.fetch('MEMORY_KILLER_REPOSITORY_IMPORT_WORKER_MEMORY_GROWTH_KB', 50).to_i

app/workers/repository_update_remote_mirror_worker.rb

@@ -6,6 +6,8 @@ class RepositoryUpdateRemoteMirrorWorker
   include ApplicationWorker
   include Gitlab::ExclusiveLeaseHelpers
+  worker_has_external_dependencies!
+
   sidekiq_options retry: 3, dead: false
   feature_category :source_code_management

app/workers/stage_update_worker.rb

@@ -5,6 +5,7 @@ class StageUpdateWorker
   include PipelineQueue
   queue_namespace :pipeline_processing
+  latency_sensitive_worker!
   # rubocop: disable CodeReuse/ActiveRecord
   def perform(stage_id)

app/workers/stuck_ci_jobs_worker.rb

@@ -5,6 +5,7 @@ class StuckCiJobsWorker
   include CronjobQueue
   feature_category :continuous_integration
+  worker_resource_boundary :cpu
   EXCLUSIVE_LEASE_KEY = 'stuck_ci_builds_worker_lease'

app/workers/stuck_import_jobs_worker.rb

@@ -5,6 +5,7 @@ class StuckImportJobsWorker
   include CronjobQueue
   feature_category :importers
+  worker_resource_boundary :cpu
   IMPORT_JOBS_EXPIRATION = 15.hours.to_i

app/workers/update_head_pipeline_for_merge_request_worker.rb

@@ -6,6 +6,8 @@ class UpdateHeadPipelineForMergeRequestWorker
   queue_namespace :pipeline_processing
   feature_category :continuous_integration
+  latency_sensitive_worker!
+  worker_resource_boundary :cpu
   def perform(merge_request_id)
     MergeRequest.find_by_id(merge_request_id).try do |merge_request|

app/workers/update_merge_requests_worker.rb

@@ -4,6 +4,8 @@ class UpdateMergeRequestsWorker
   include ApplicationWorker
   feature_category :source_code_management
+  latency_sensitive_worker!
+  worker_resource_boundary :cpu
   LOG_TIME_THRESHOLD = 90 # seconds

app/workers/wait_for_cluster_creation_worker.rb

@@ -4,6 +4,8 @@ class WaitForClusterCreationWorker
   include ApplicationWorker
   include ClusterQueue
+  worker_has_external_dependencies!
+
   def perform(cluster_id)
     Clusters::Cluster.find_by_id(cluster_id).try do |cluster|
       cluster.provider.try do |provider|

app/workers/web_hook_worker.rb

@@ -4,6 +4,8 @@ class WebHookWorker
   include ApplicationWorker
   feature_category :integrations
+  worker_has_external_dependencies!
+
   sidekiq_options retry: 4, dead: false
   def perform(hook_id, data, hook_name)

changelogs/unreleased/32935-preventing-accidental-project-deletion-db-changes.yml

+---
+title: Add migrations and changes for soft-delete for projects
+merge_request: 18791
+author:
+type: added

changelogs/unreleased/33054-share_groups_with_groups.yml

+---
+title: Share groups with groups
+merge_request: 17117
+author:
+type: added

changelogs/unreleased/5366-display-anomaly-deviation-boundaries-on-dashboard-ce.yml

+---
+title: Added new chart component to display an anomaly boundary
+merge_request: 16530
+author:
+type: added

changelogs/unreleased/add-missing-bottom-padding-in-settings.yml

+---
+title: Add missing bottom padding in CI/CD settings
+merge_request: 19284
+author: George Tsiolis
+type: fixed

changelogs/unreleased/an-mark-jobs-as-latency-sensitive.yml

+---
+title: Attribute Sidekiq workers according to their workloads
+merge_request: 18066
+author:
+type: other

changelogs/unreleased/security-open-redirect-internalredirect.yml → changelogs/unreleased/security-remove-deploy-access-levels-on-project-group-link-deletion.yml

 ---
-title: Fixes a Open Redirect issue in `InternalRedirect`.
+title: Remove deploy access level when project/group link is deleted
 merge_request:
 author:
 type: security