Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 20 deletions

diff --git a/app/assets/javascripts/invite_members/components/invite_members_modal.vue b/app/assets/javascripts/invite_members/components/invite_members_modal.vue
index 607c888b85a..812e39e6392 100644
--- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue
+++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue
@@ -51,6 +51,8 @@ export default {
     MembersTokenSelect,
     ModalConfetti,
     UserLimitNotification,
+    ActiveTrialNotification: () =>
+      import('ee_component/invite_members/components/active_trial_notification.vue'),
   },
   mixins: [Tracking.mixin({ category: INVITE_MEMBER_MODAL_TRACKING_CATEGORY })],
   inject: ['newProjectPath'],
@@ -421,7 +423,6 @@ export default {
     :new-users-to-invite="newUsersToInvite"
     :root-group-id="rootId"
     :users-limit-dataset="usersLimitDataset"
-    :active-trial-dataset="activeTrialDataset"
     :full-path="fullPath"
     @close="onClose"
     @cancel="onCancel"
@@ -504,6 +505,10 @@ export default {
       </div>
     </template>
 
+    <template #active-trial-alert>
+      <active-trial-notification v-if="!isCelebration" :active-trial-dataset="activeTrialDataset" />
+    </template>
+
     <template #select="{ exceptionState, inputId }">
       <members-token-select
         v-model="newUsersToInvite"
diff --git a/app/services/ci/job_artifacts/destroy_all_expired_service.rb b/app/services/ci/job_artifacts/destroy_all_expired_service.rb
index b5dd5b843c6..30683475ad2 100644
--- a/app/services/ci/job_artifacts/destroy_all_expired_service.rb
+++ b/app/services/ci/job_artifacts/destroy_all_expired_service.rb
@@ -25,11 +25,7 @@ module Ci
       # which is scheduled every 7 minutes.
       def execute
         in_lock(EXCLUSIVE_LOCK_KEY, ttl: LOCK_TIMEOUT, retries: 1) do
-          if ::Feature.enabled?(:ci_destroy_unlocked_job_artifacts)
-            destroy_unlocked_job_artifacts
-          else
-            destroy_job_artifacts_with_slow_iteration
-          end
+          destroy_unlocked_job_artifacts
         end
 
         @removed_artifacts_count
@@ -45,20 +41,6 @@ module Ci
         end
       end
 
-      def destroy_job_artifacts_with_slow_iteration
-        Ci::JobArtifact.expired_before(@start_at).each_batch(of: BATCH_SIZE, column: :expire_at, order: :desc) do |relation, index|
-          # For performance reasons, join with ci_pipelines after the batch is queried.
-          # See: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47496
-          artifacts = relation.unlocked
-
-          service_response = destroy_batch(artifacts)
-          @removed_artifacts_count += service_response[:destroyed_artifacts_count]
-
-          break if loop_timeout?
-          break if index >= LOOP_LIMIT
-        end
-      end
-
       def destroy_batch(artifacts)
         Ci::JobArtifacts::DestroyBatchService.new(artifacts, skip_projects_on_refresh: true).execute
       end