Add latest changes from gitlab-org/gitlab@master

spec/lib/gitlab/background_migration/migrate_stage_index_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
-describe Gitlab::BackgroundMigration::MigrateStageIndex, :migration, schema: 20180420080616 do
+describe Gitlab::BackgroundMigration::MigrateStageIndex, schema: 20180420080616 do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:pipelines) { table(:ci_pipelines) }

spec/lib/gitlab/background_migration/populate_cluster_kubernetes_namespace_table_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
-describe Gitlab::BackgroundMigration::PopulateClusterKubernetesNamespaceTable, :migration, schema: 20181022173835 do
+describe Gitlab::BackgroundMigration::PopulateClusterKubernetesNamespaceTable, schema: 20181022173835 do
   include MigrationHelpers::ClusterHelpers
   let(:migration) { described_class.new }

spec/lib/gitlab/background_migration/populate_merge_request_assignees_table_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
-describe Gitlab::BackgroundMigration::PopulateMergeRequestAssigneesTable, :migration, schema: 20190315191339 do
+describe Gitlab::BackgroundMigration::PopulateMergeRequestAssigneesTable, schema: 20190315191339 do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:users) { table(:users) }

spec/lib/gitlab/background_migration/populate_untracked_uploads_dependencies/untracked_file_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 # Rollback DB to 10.5 (later than this was originally written for) because it still needs to work.
-describe Gitlab::BackgroundMigration::PopulateUntrackedUploadsDependencies::UntrackedFile, :migration, schema: 20180208183958 do
+describe Gitlab::BackgroundMigration::PopulateUntrackedUploadsDependencies::UntrackedFile, schema: 20180208183958 do
   include MigrationsHelpers::TrackUntrackedUploadsHelpers
   let!(:appearances) { table(:appearances) }

spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 # Rollback DB to 10.5 (later than this was originally written for) because it still needs to work.
-describe Gitlab::BackgroundMigration::PopulateUntrackedUploads, :migration, schema: 20180208183958 do
+describe Gitlab::BackgroundMigration::PopulateUntrackedUploads, schema: 20180208183958 do
   include MigrationsHelpers::TrackUntrackedUploadsHelpers
   subject { described_class.new }

spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 # Rollback DB to 10.5 (later than this was originally written for) because it still needs to work.
-describe Gitlab::BackgroundMigration::PrepareUntrackedUploads, :migration, schema: 20180208183958 do
+describe Gitlab::BackgroundMigration::PrepareUntrackedUploads, schema: 20180208183958 do
   include MigrationsHelpers::TrackUntrackedUploadsHelpers
   let!(:untracked_files_for_uploads) { table(:untracked_files_for_uploads) }

spec/lib/gitlab/background_migration/recalculate_project_authorizations_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
-describe Gitlab::BackgroundMigration::RecalculateProjectAuthorizations, :migration, schema: 20200204113223 do
+describe Gitlab::BackgroundMigration::RecalculateProjectAuthorizations, schema: 20200204113223 do
   let(:users_table) { table(:users) }
   let(:namespaces_table) { table(:namespaces) }
   let(:projects_table) { table(:projects) }

spec/lib/gitlab/background_migration/recalculate_project_authorizations_with_min_max_user_id_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
-describe Gitlab::BackgroundMigration::RecalculateProjectAuthorizationsWithMinMaxUserId, :migration, schema: 20200204113224 do
+describe Gitlab::BackgroundMigration::RecalculateProjectAuthorizationsWithMinMaxUserId, schema: 20200204113224 do
   let(:users_table) { table(:users) }
   let(:min) { 1 }
   let(:max) { 5 }

spec/lib/gitlab/background_migration/remove_restricted_todos_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
-describe Gitlab::BackgroundMigration::RemoveRestrictedTodos, :migration, schema: 20180704204006 do
+describe Gitlab::BackgroundMigration::RemoveRestrictedTodos, schema: 20180704204006 do
   let(:projects)               { table(:projects) }
   let(:users)                  { table(:users) }
   let(:todos)                  { table(:todos) }

spec/lib/gitlab/background_migration/reset_merge_status_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
-describe Gitlab::BackgroundMigration::ResetMergeStatus, :migration, schema: 20190528180441 do
+describe Gitlab::BackgroundMigration::ResetMergeStatus, schema: 20190528180441 do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab-org') }

spec/lib/gitlab/background_migration/schedule_calculate_wiki_sizes_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190527194900_schedule_calculate_wiki_sizes.rb')
-describe ScheduleCalculateWikiSizes, :migration do
+describe ScheduleCalculateWikiSizes do
   let(:migration_class) { Gitlab::BackgroundMigration::CalculateWikiSizes }
   let(:migration_name)  { migration_class.to_s.demodulize }

spec/lib/gitlab/background_migration/set_confidential_note_events_on_services_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
-describe Gitlab::BackgroundMigration::SetConfidentialNoteEventsOnServices, :migration, schema: 20180122154930 do
+describe Gitlab::BackgroundMigration::SetConfidentialNoteEventsOnServices, schema: 20180122154930 do
   let(:services) { table(:services) }
   describe '#perform' do

spec/lib/gitlab/background_migration/set_confidential_note_events_on_webhooks_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
-describe Gitlab::BackgroundMigration::SetConfidentialNoteEventsOnWebhooks, :migration, schema: 20180104131052 do
+describe Gitlab::BackgroundMigration::SetConfidentialNoteEventsOnWebhooks, schema: 20180104131052 do
   let(:web_hooks) { table(:web_hooks) }
   describe '#perform' do

spec/lib/gitlab/background_migration/update_existing_subgroup_to_match_visibility_level_of_parent_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
-describe Gitlab::BackgroundMigration::UpdateExistingSubgroupToMatchVisibilityLevelOfParent, :migration, schema: 2020_01_10_121314 do
+describe Gitlab::BackgroundMigration::UpdateExistingSubgroupToMatchVisibilityLevelOfParent, schema: 2020_01_10_121314 do
   include MigrationHelpers::NamespacesHelpers
   context 'private visibility level' do

spec/lib/gitlab/background_migration_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
-describe Gitlab::BackgroundMigration do
+describe Gitlab::BackgroundMigration, schema: :latest do
   describe '.queue' do
     it 'returns background migration worker queue' do
       expect(described_class.queue)

spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190924152703_migrate_issue_trackers_data.rb')
-describe MigrateIssueTrackersData, :migration do
+describe MigrateIssueTrackersData do
   let(:services) { table(:services) }
   let(:migration_class) { Gitlab::BackgroundMigration::MigrateIssueTrackersSensitiveData }
   let(:migration_name)  { migration_class.to_s.demodulize }

spec/migrations/20191015154408_drop_merge_requests_require_code_owner_approval_from_projects_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20191015154408_drop_merge_requests_require_code_owner_approval_from_projects.rb')
-describe DropMergeRequestsRequireCodeOwnerApprovalFromProjects, :migration do
+describe DropMergeRequestsRequireCodeOwnerApprovalFromProjects do
   let(:projects_table) { table(:projects) }
   subject(:migration) { described_class.new }

spec/migrations/20191125114345_add_admin_mode_protected_path_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20191125114345_add_admin_mode_protected_path.rb')
-describe AddAdminModeProtectedPath, :migration do
+describe AddAdminModeProtectedPath do
   ADMIN_MODE_ENDPOINT = '/admin/session'
   subject(:migration) { described_class.new }

spec/migrations/20191204114127_delete_legacy_triggers_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20191204114127_delete_legacy_triggers.rb')
-describe DeleteLegacyTriggers, :migration, schema: 2019_11_25_140458 do
+describe DeleteLegacyTriggers, schema: 2019_11_25_140458 do
   let(:ci_trigger_table) { table(:ci_triggers) }
   let(:user) { table(:users).create!(name: 'test', email: 'test@example.com', projects_limit: 1) }

spec/migrations/20200107172020_add_timestamp_softwarelicensespolicy_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20200107172020_add_timestamp_softwarelicensespolicy.rb')
-describe AddTimestampSoftwarelicensespolicy, :migration do
+describe AddTimestampSoftwarelicensespolicy do
   let(:software_licenses_policy) { table(:software_license_policies) }
   let(:projects) { table(:projects) }
   let(:licenses) { table(:software_licenses) }