Add latest changes from gitlab-org/gitlab@master

7 files changed, 29 insertions, 27 deletions

diff --git a/lib/gitlab/background_migration/backfill_integrations_enable_ssl_verification.rb b/lib/gitlab/background_migration/backfill_integrations_enable_ssl_verification.rb
index de52629522b..878f89a8b3d 100644
--- a/lib/gitlab/background_migration/backfill_integrations_enable_ssl_verification.rb
+++ b/lib/gitlab/background_migration/backfill_integrations_enable_ssl_verification.rb
@@ -40,13 +40,13 @@ module Gitlab
         scope :affected, -> { where(type_new: INTEGRATIONS.keys).where.not(encrypted_properties: nil) }
 
         attr_encrypted :properties,
-                      mode: :per_attribute_iv,
-                      key: Settings.attr_encrypted_db_key_base_32,
-                      algorithm: 'aes-256-gcm',
-                      marshal: true,
-                      marshaler: ::Gitlab::Json,
-                      encode: false,
-                      encode_iv: false
+          mode: :per_attribute_iv,
+          key: Settings.attr_encrypted_db_key_base_32,
+          algorithm: 'aes-256-gcm',
+          marshal: true,
+          marshaler: ::Gitlab::Json,
+          encode: false,
+          encode_iv: false
 
         # Handle assignment of props with symbol keys.
         # To do this correctly, we need to call the method generated by attr_encrypted.
diff --git a/lib/gitlab/background_migration/disable_legacy_open_source_license_for_no_issues_no_repo_projects.rb b/lib/gitlab/background_migration/disable_legacy_open_source_license_for_no_issues_no_repo_projects.rb
index 2eb7c5230ba..276c7a1c6fa 100644
--- a/lib/gitlab/background_migration/disable_legacy_open_source_license_for_no_issues_no_repo_projects.rb
+++ b/lib/gitlab/background_migration/disable_legacy_open_source_license_for_no_issues_no_repo_projects.rb
@@ -23,8 +23,9 @@ module Gitlab
               .joins('LEFT OUTER JOIN project_statistics ON project_statistics.project_id = projects.id')
               .joins('LEFT OUTER JOIN project_settings ON project_settings.project_id = projects.id')
               .joins('LEFT OUTER JOIN issues ON issues.project_id = projects.id')
-              .where('project_statistics.repository_size' => 0,
-                     'project_settings.legacy_open_source_license_available' => true)
+              .where(
+                'project_statistics.repository_size' => 0,
+                'project_settings.legacy_open_source_license_available' => true)
               .group('projects.id')
               .having('COUNT(issues.id) = 0')
 
diff --git a/lib/gitlab/background_migration/disable_legacy_open_source_license_for_one_member_no_repo_projects.rb b/lib/gitlab/background_migration/disable_legacy_open_source_license_for_one_member_no_repo_projects.rb
index 8953836c705..7661ae4b5ad 100644
--- a/lib/gitlab/background_migration/disable_legacy_open_source_license_for_one_member_no_repo_projects.rb
+++ b/lib/gitlab/background_migration/disable_legacy_open_source_license_for_one_member_no_repo_projects.rb
@@ -23,8 +23,9 @@ module Gitlab
               .joins('LEFT OUTER JOIN project_statistics ON project_statistics.project_id = projects.id')
               .joins('LEFT OUTER JOIN project_settings ON project_settings.project_id = projects.id')
               .joins('LEFT OUTER JOIN project_authorizations ON project_authorizations.project_id = projects.id')
-              .where('project_statistics.repository_size' => 0,
-                     'project_settings.legacy_open_source_license_available' => true)
+              .where(
+                'project_statistics.repository_size' => 0,
+                'project_settings.legacy_open_source_license_available' => true)
               .group('projects.id')
               .having('COUNT(project_authorizations.user_id) = 1')
 
diff --git a/lib/gitlab/background_migration/encrypt_integration_properties.rb b/lib/gitlab/background_migration/encrypt_integration_properties.rb
index c9582da2a51..28c28ae48eb 100644
--- a/lib/gitlab/background_migration/encrypt_integration_properties.rb
+++ b/lib/gitlab/background_migration/encrypt_integration_properties.rb
@@ -18,14 +18,14 @@ module Gitlab
         scope :for_batch, ->(range) { where(id: range) }
 
         attr_encrypted :encrypted_properties_tmp,
-                       attribute: :encrypted_properties,
-                       mode: :per_attribute_iv,
-                       key: ::Settings.attr_encrypted_db_key_base_32,
-                       algorithm: ALGORITHM,
-                       marshal: true,
-                       marshaler: ::Gitlab::Json,
-                       encode: false,
-                       encode_iv: false
+          attribute: :encrypted_properties,
+          mode: :per_attribute_iv,
+          key: ::Settings.attr_encrypted_db_key_base_32,
+          algorithm: ALGORITHM,
+          marshal: true,
+          marshaler: ::Gitlab::Json,
+          encode: false,
+          encode_iv: false
 
         # See 'Integration#reencrypt_properties'
         def encrypt_properties
diff --git a/lib/gitlab/background_migration/fix_incoherent_packages_size_on_project_statistics.rb b/lib/gitlab/background_migration/fix_incoherent_packages_size_on_project_statistics.rb
index 4b6bb12c91b..afd5e18ed7d 100644
--- a/lib/gitlab/background_migration/fix_incoherent_packages_size_on_project_statistics.rb
+++ b/lib/gitlab/background_migration/fix_incoherent_packages_size_on_project_statistics.rb
@@ -69,14 +69,14 @@ module Gitlab
         self.table_name = 'packages_packages'
 
         has_many :package_files,
-                 class_name: '::Gitlab::BackgroundMigration::FixIncoherentPackagesSizeOnProjectStatistics::PackageFile' # rubocop:disable Layout/LineLength
+          class_name: '::Gitlab::BackgroundMigration::FixIncoherentPackagesSizeOnProjectStatistics::PackageFile'
       end
 
       class PackageFile < ::ApplicationRecord
         self.table_name = 'packages_package_files'
 
         belongs_to :package,
-                   class_name: '::Gitlab::BackgroundMigration::FixIncoherentPackagesSizeOnProjectStatistics::Package' # rubocop:disable Layout/LineLength
+          class_name: '::Gitlab::BackgroundMigration::FixIncoherentPackagesSizeOnProjectStatistics::Package'
 
         def self.sum_query
           packages = FixIncoherentPackagesSizeOnProjectStatistics::Package.arel_table
diff --git a/lib/gitlab/background_migration/remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings.rb b/lib/gitlab/background_migration/remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings.rb
index 7fe5a427d10..f4f54e2b2eb 100644
--- a/lib/gitlab/background_migration/remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings.rb
+++ b/lib/gitlab/background_migration/remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings.rb
@@ -53,7 +53,7 @@ class Gitlab::BackgroundMigration::RemoveOccurrencePipelinesAndDuplicateVulnerab
   def mark_job_as_succeeded(*arguments)
     Gitlab::Database::BackgroundMigrationJob.mark_all_as_succeeded(
       self.class.name.demodulize,
-       arguments
+      arguments
     )
   end
 end
diff --git a/lib/gitlab/background_migration/reset_status_on_container_repositories.rb b/lib/gitlab/background_migration/reset_status_on_container_repositories.rb
index 0dbe2781327..56506814dc0 100644
--- a/lib/gitlab/background_migration/reset_status_on_container_repositories.rb
+++ b/lib/gitlab/background_migration/reset_status_on_container_repositories.rb
@@ -36,8 +36,8 @@ module Gitlab
 
         included do
           has_one :route,
-                  as: :source,
-                  class_name: '::Gitlab::BackgroundMigration::ResetStatusOnContainerRepositories::Route'
+            as: :source,
+            class_name: '::Gitlab::BackgroundMigration::ResetStatusOnContainerRepositories::Route'
         end
 
         def full_path
@@ -67,7 +67,7 @@ module Gitlab
         self.inheritance_column = :_type_disabled
 
         belongs_to :parent,
-                   class_name: '::Gitlab::BackgroundMigration::ResetStatusOnContainerRepositories::Namespace'
+          class_name: '::Gitlab::BackgroundMigration::ResetStatusOnContainerRepositories::Namespace'
 
         def self.polymorphic_name
           'Namespace'
@@ -80,7 +80,7 @@ module Gitlab
         self.table_name = 'projects'
 
         belongs_to :namespace,
-                   class_name: '::Gitlab::BackgroundMigration::ResetStatusOnContainerRepositories::Namespace'
+          class_name: '::Gitlab::BackgroundMigration::ResetStatusOnContainerRepositories::Namespace'
 
         alias_method :parent, :namespace
         alias_attribute :parent_id, :namespace_id
@@ -92,7 +92,7 @@ module Gitlab
         self.table_name = 'container_repositories'
 
         belongs_to :project,
-                   class_name: '::Gitlab::BackgroundMigration::ResetStatusOnContainerRepositories::Project'
+          class_name: '::Gitlab::BackgroundMigration::ResetStatusOnContainerRepositories::Project'
 
         def tags?
           result = ContainerRegistry.tags_for(path).any?