Add latest changes from gitlab-org/gitlab@master

6 files changed, 13 insertions, 74 deletions

diff --git a/lib/gitlab/background_migration/copy_column_using_background_migration_job.rb b/lib/gitlab/background_migration/copy_column_using_background_migration_job.rb
index c7226b41bab..529b8cdf8d4 100644
--- a/lib/gitlab/background_migration/copy_column_using_background_migration_job.rb
+++ b/lib/gitlab/background_migration/copy_column_using_background_migration_job.rb
@@ -16,8 +16,6 @@ module Gitlab
     class CopyColumnUsingBackgroundMigrationJob
       include Gitlab::Database::DynamicModelHelpers
 
-      PAUSE_SECONDS = 0.1
-
       # start_id - The start ID of the range of rows to update.
       # end_id - The end ID of the range of rows to update.
       # batch_table - The name of the table that contains the columns.
@@ -25,9 +23,10 @@ module Gitlab
       # sub_batch_size - We don't want updates to take more than ~100ms
       #                  This allows us to run multiple smaller batches during
       #                  the minimum 2.minute interval that we can schedule jobs
+      # pause_ms - The number of milliseconds to sleep between each subbatch execution.
       # copy_from - List of columns containing the data to copy.
       # copy_to - List of columns to copy the data to. Order must match the order in `copy_from`.
-      def perform(start_id, end_id, batch_table, batch_column, sub_batch_size, copy_from, copy_to)
+      def perform(start_id, end_id, batch_table, batch_column, sub_batch_size, pause_ms, copy_from, copy_to)
         copy_from = Array.wrap(copy_from)
         copy_to = Array.wrap(copy_to)
 
@@ -42,7 +41,8 @@ module Gitlab
             sub_batch.update_all(assignment_clauses)
           end
 
-          sleep(PAUSE_SECONDS)
+          pause_ms = 0 if pause_ms < 0
+          sleep(pause_ms * 0.001)
         end
       end
 
diff --git a/lib/gitlab/database/background_migration/batched_migration.rb b/lib/gitlab/database/background_migration/batched_migration.rb
index 4aa33ed7946..aa03305ae58 100644
--- a/lib/gitlab/database/background_migration/batched_migration.rb
+++ b/lib/gitlab/database/background_migration/batched_migration.rb
@@ -35,7 +35,13 @@ module Gitlab
         end
 
         def create_batched_job!(min, max)
-          batched_jobs.create!(min_value: min, max_value: max, batch_size: batch_size, sub_batch_size: sub_batch_size)
+          batched_jobs.create!(
+            min_value: min,
+            max_value: max,
+            batch_size: batch_size,
+            sub_batch_size: sub_batch_size,
+            pause_ms: pause_ms
+          )
         end
 
         def next_min_value
diff --git a/lib/gitlab/database/background_migration/batched_migration_wrapper.rb b/lib/gitlab/database/background_migration/batched_migration_wrapper.rb
index 110c00e284e..a0b661119ed 100644
--- a/lib/gitlab/database/background_migration/batched_migration_wrapper.rb
+++ b/lib/gitlab/database/background_migration/batched_migration_wrapper.rb
@@ -43,6 +43,7 @@ module Gitlab
             tracking_record.migration_table_name,
             tracking_record.migration_column_name,
             tracking_record.sub_batch_size,
+            tracking_record.pause_ms,
             *tracking_record.migration_job_arguments)
 
           if job_instance.respond_to?(:batch_metrics)
diff --git a/lib/gitlab/usage_data_counters/known_events/quickactions.yml b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
index 0fe65afb237..c1eabb352f7 100644
--- a/lib/gitlab/usage_data_counters/known_events/quickactions.yml
+++ b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
@@ -3,334 +3,267 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_assign_single
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_assign_multiple
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_assign_self
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_assign_reviewer
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_award
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_board_move
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_child_epic
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_clear_weight
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_clone
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_close
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_confidential
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_copy_metadata_merge_request
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_copy_metadata_issue
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_create_merge_request
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_done
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_draft
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_due
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_duplicate
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_epic
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_estimate
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_iteration
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_label
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_lock
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_merge
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_milestone
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_move
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_parent_epic
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_promote
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_publish
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_reassign
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_reassign_reviewer
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_rebase
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_relabel
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_relate
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_child_epic
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_due_date
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_epic
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_estimate
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_iteration
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_milestone
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_parent_epic
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_time_spent
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_zoom
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_reopen
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_shrug
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_spend_subtract
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_spend_add
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_submit_review
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_subscribe
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_tableflip
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_tag
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_target_branch
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_title
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_todo
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unassign_specific
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unassign_all
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unassign_reviewer
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unlabel_specific
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unlabel_all
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unlock
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unsubscribe
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_weight
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_wip
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_zoom
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_invite_email_single
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_invite_email_multiple
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
diff --git a/lib/gitlab/usage_data_counters/quick_action_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/quick_action_activity_unique_counter.rb
index ed3df7dcf75..557179ad57a 100644
--- a/lib/gitlab/usage_data_counters/quick_action_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/quick_action_activity_unique_counter.rb
@@ -7,7 +7,6 @@ module Gitlab
         # Tracks the quick action with name `name`.
         # `args` is expected to be a single string, will be split internally when necessary.
         def track_unique_action(name, args:, user:)
-          return unless Feature.enabled?(:usage_data_track_quickactions, default_enabled: :yaml)
           return unless user
 
           args ||= ''
diff --git a/lib/object_storage/direct_upload.rb b/lib/object_storage/direct_upload.rb
index 7f1c30e574d..7fbf01f3768 100644
--- a/lib/object_storage/direct_upload.rb
+++ b/lib/object_storage/direct_upload.rb
@@ -79,7 +79,7 @@ module ObjectStorage
           Provider: 'AWS',
           S3Config: {
             Bucket: bucket_name,
-            Region: credentials[:region],
+            Region: credentials[:region] || ::Fog::AWS::Storage::DEFAULT_REGION,
             Endpoint: credentials[:endpoint],
             PathStyle: config.use_path_style?,
             UseIamProfile: config.use_iam_profile?,