Add latest changes from gitlab-org/gitlab@13-1-stable-ee

10 files changed, 22 insertions, 9 deletions

diff --git a/lib/gitlab/background_migration/.rubocop.yml b/lib/gitlab/background_migration/.rubocop.yml
index 8242821cedc..50112a51675 100644
--- a/lib/gitlab/background_migration/.rubocop.yml
+++ b/lib/gitlab/background_migration/.rubocop.yml
@@ -15,7 +15,7 @@ Metrics/AbcSize:
 Metrics/PerceivedComplexity:
   Enabled: true
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: true
   Details: >
     Long lines are very hard to read and make it more difficult to review
diff --git a/lib/gitlab/background_migration/backfill_project_repositories.rb b/lib/gitlab/background_migration/backfill_project_repositories.rb
index 263546bd132..bc113a1e33d 100644
--- a/lib/gitlab/background_migration/backfill_project_repositories.rb
+++ b/lib/gitlab/background_migration/backfill_project_repositories.rb
@@ -189,7 +189,7 @@ module Gitlab
       end
 
       def perform(start_id, stop_id)
-        Gitlab::Database.bulk_insert(:project_repositories, project_repositories(start_id, stop_id))
+        Gitlab::Database.bulk_insert(:project_repositories, project_repositories(start_id, stop_id)) # rubocop:disable Gitlab/BulkInsert
       end
 
       private
diff --git a/lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb b/lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb
index c652a5bb3fc..e750b8ca374 100644
--- a/lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb
+++ b/lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb
@@ -62,7 +62,7 @@ module Gitlab
         class PrometheusService < ActiveRecord::Base
           self.inheritance_column = :_type_disabled
           self.table_name = 'services'
-          default_scope { where(type: type) }
+          default_scope { where(type: type) } # rubocop:disable Cop/DefaultScope
 
           def self.type
             'PrometheusService'
diff --git a/lib/gitlab/background_migration/fix_ruby_object_in_audit_events.rb b/lib/gitlab/background_migration/fix_ruby_object_in_audit_events.rb
new file mode 100644
index 00000000000..46921a070c3
--- /dev/null
+++ b/lib/gitlab/background_migration/fix_ruby_object_in_audit_events.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # Remove serialized Ruby object in audit_events
+    class FixRubyObjectInAuditEvents
+      def perform(start_id, stop_id)
+      end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::FixRubyObjectInAuditEvents.prepend_if_ee('EE::Gitlab::BackgroundMigration::FixRubyObjectInAuditEvents')
diff --git a/lib/gitlab/background_migration/migrate_fingerprint_sha256_within_keys.rb b/lib/gitlab/background_migration/migrate_fingerprint_sha256_within_keys.rb
index 899f381e911..d2a9939b9ee 100644
--- a/lib/gitlab/background_migration/migrate_fingerprint_sha256_within_keys.rb
+++ b/lib/gitlab/background_migration/migrate_fingerprint_sha256_within_keys.rb
@@ -34,7 +34,7 @@ module Gitlab
             end
           end
 
-          Gitlab::Database.bulk_insert(TEMP_TABLE, fingerprints)
+          Gitlab::Database.bulk_insert(TEMP_TABLE, fingerprints) # rubocop:disable Gitlab/BulkInsert
 
           execute("ANALYZE #{TEMP_TABLE}")
 
diff --git a/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data.rb b/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data.rb
index 956f9daa493..2bce5037d03 100644
--- a/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data.rb
+++ b/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data.rb
@@ -65,7 +65,7 @@ module Gitlab
           next if service_ids.empty?
 
           migrated_ids += service_ids
-          Gitlab::Database.bulk_insert(table, data)
+          Gitlab::Database.bulk_insert(table, data) # rubocop:disable Gitlab/BulkInsert
         end
 
         return if migrated_ids.empty?
diff --git a/lib/gitlab/background_migration/populate_cluster_kubernetes_namespace_table.rb b/lib/gitlab/background_migration/populate_cluster_kubernetes_namespace_table.rb
index 35bfc381180..fcbcaacb2d6 100644
--- a/lib/gitlab/background_migration/populate_cluster_kubernetes_namespace_table.rb
+++ b/lib/gitlab/background_migration/populate_cluster_kubernetes_namespace_table.rb
@@ -73,7 +73,7 @@ module Gitlab
       end
 
       def insert_into_cluster_kubernetes_namespace(rows)
-        Gitlab::Database.bulk_insert(Migratable::KubernetesNamespace.table_name,
+        Gitlab::Database.bulk_insert(Migratable::KubernetesNamespace.table_name, # rubocop:disable Gitlab/BulkInsert
                                      rows,
                                      disable_quote: [:created_at, :updated_at])
       end
diff --git a/lib/gitlab/background_migration/populate_untracked_uploads.rb b/lib/gitlab/background_migration/populate_untracked_uploads.rb
index d2924d10225..43698b7955f 100644
--- a/lib/gitlab/background_migration/populate_untracked_uploads.rb
+++ b/lib/gitlab/background_migration/populate_untracked_uploads.rb
@@ -95,7 +95,7 @@ module Gitlab
           file.to_h.merge(created_at: 'NOW()')
         end
 
-        Gitlab::Database.bulk_insert('uploads',
+        Gitlab::Database.bulk_insert('uploads', # rubocop:disable Gitlab/BulkInsert
                                      rows,
                                      disable_quote: :created_at)
       end
diff --git a/lib/gitlab/background_migration/reset_merge_status.rb b/lib/gitlab/background_migration/reset_merge_status.rb
index 447fec8903c..d040b4931be 100644
--- a/lib/gitlab/background_migration/reset_merge_status.rb
+++ b/lib/gitlab/background_migration/reset_merge_status.rb
@@ -7,7 +7,7 @@ module Gitlab
     class ResetMergeStatus
       def perform(from_id, to_id)
         relation = MergeRequest.where(id: from_id..to_id,
-                                      state: 'opened',
+                                      state_id: 1, # opened
                                       merge_status: 'can_be_merged')
 
         relation.update_all(merge_status: 'unchecked')
diff --git a/lib/gitlab/background_migration/user_mentions/create_resource_user_mention.rb b/lib/gitlab/background_migration/user_mentions/create_resource_user_mention.rb
index cf0f582a2d4..d71a50a0af6 100644
--- a/lib/gitlab/background_migration/user_mentions/create_resource_user_mention.rb
+++ b/lib/gitlab/background_migration/user_mentions/create_resource_user_mention.rb
@@ -25,7 +25,7 @@ module Gitlab
               mentions << mention_record unless mention_record.blank?
             end
 
-            Gitlab::Database.bulk_insert(
+            Gitlab::Database.bulk_insert( # rubocop:disable Gitlab/BulkInsert
               resource_user_mention_model.table_name,
               mentions,
               return_ids: true,