Add latest changes from gitlab-org/gitlab@master

112 files changed, 112 insertions, 112 deletions

diff --git a/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb b/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
index a84cac0623b..dfa4cc21d63 100644
--- a/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
+++ b/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 }
diff --git a/spec/migrations/20191015154408_drop_merge_requests_require_code_owner_approval_from_projects_spec.rb b/spec/migrations/20191015154408_drop_merge_requests_require_code_owner_approval_from_projects_spec.rb
index e90d56cfeef..ac9ff5632eb 100644
--- a/spec/migrations/20191015154408_drop_merge_requests_require_code_owner_approval_from_projects_spec.rb
+++ b/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 }
diff --git a/spec/migrations/20191125114345_add_admin_mode_protected_path_spec.rb b/spec/migrations/20191125114345_add_admin_mode_protected_path_spec.rb
index 110da221393..669e31618a3 100644
--- a/spec/migrations/20191125114345_add_admin_mode_protected_path_spec.rb
+++ b/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 }
diff --git a/spec/migrations/20191204114127_delete_legacy_triggers_spec.rb b/spec/migrations/20191204114127_delete_legacy_triggers_spec.rb
index c2660d699ca..58061d80f21 100644
--- a/spec/migrations/20191204114127_delete_legacy_triggers_spec.rb
+++ b/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) }
 
diff --git a/spec/migrations/20200107172020_add_timestamp_softwarelicensespolicy_spec.rb b/spec/migrations/20200107172020_add_timestamp_softwarelicensespolicy_spec.rb
index b0d2aea7015..7a6b21d485b 100644
--- a/spec/migrations/20200107172020_add_timestamp_softwarelicensespolicy_spec.rb
+++ b/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) }
diff --git a/spec/migrations/20200122123016_backfill_project_settings_spec.rb b/spec/migrations/20200122123016_backfill_project_settings_spec.rb
index fec18d6d52b..ce86e94b6d5 100644
--- a/spec/migrations/20200122123016_backfill_project_settings_spec.rb
+++ b/spec/migrations/20200122123016_backfill_project_settings_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200122123016_backfill_project_settings.rb')
 
-describe BackfillProjectSettings, :migration, :sidekiq, schema: 20200114113341 do
+describe BackfillProjectSettings, :sidekiq, schema: 20200114113341 do
   let(:projects) { table(:projects) }
   let(:namespace) { table(:namespaces).create(name: 'user', path: 'user') }
   let(:project) { projects.create(namespace_id: namespace.id) }
diff --git a/spec/migrations/20200123155929_remove_invalid_jira_data_spec.rb b/spec/migrations/20200123155929_remove_invalid_jira_data_spec.rb
index 0e640623ea9..253e39c1647 100644
--- a/spec/migrations/20200123155929_remove_invalid_jira_data_spec.rb
+++ b/spec/migrations/20200123155929_remove_invalid_jira_data_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200123155929_remove_invalid_jira_data.rb')
 
-describe RemoveInvalidJiraData, :migration do
+describe RemoveInvalidJiraData do
   let(:jira_tracker_data) { table(:jira_tracker_data) }
   let(:services) { table(:services) }
 
diff --git a/spec/migrations/20200127090233_remove_invalid_issue_tracker_data_spec.rb b/spec/migrations/20200127090233_remove_invalid_issue_tracker_data_spec.rb
index d1b1dfb1904..ca7cde08071 100644
--- a/spec/migrations/20200127090233_remove_invalid_issue_tracker_data_spec.rb
+++ b/spec/migrations/20200127090233_remove_invalid_issue_tracker_data_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200127090233_remove_invalid_issue_tracker_data.rb')
 
-describe RemoveInvalidIssueTrackerData, :migration do
+describe RemoveInvalidIssueTrackerData do
   let(:issue_tracker_data) { table(:issue_tracker_data) }
   let(:services) { table(:services) }
 
diff --git a/spec/migrations/20200130145430_reschedule_migrate_issue_trackers_data_spec.rb b/spec/migrations/20200130145430_reschedule_migrate_issue_trackers_data_spec.rb
index b51708dd5cd..8e3e55f3e19 100644
--- a/spec/migrations/20200130145430_reschedule_migrate_issue_trackers_data_spec.rb
+++ b/spec/migrations/20200130145430_reschedule_migrate_issue_trackers_data_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200130145430_reschedule_migrate_issue_trackers_data.rb')
 
-describe RescheduleMigrateIssueTrackersData, :migration do
+describe RescheduleMigrateIssueTrackersData do
   let(:services) { table(:services) }
   let(:migration_class) { Gitlab::BackgroundMigration::MigrateIssueTrackersSensitiveData }
   let(:migration_name)  { migration_class.to_s.demodulize }
diff --git a/spec/migrations/active_record/schedule_set_confidential_note_events_on_services_spec.rb b/spec/migrations/active_record/schedule_set_confidential_note_events_on_services_spec.rb
index 4de43e21ed3..e973454ecc8 100644
--- a/spec/migrations/active_record/schedule_set_confidential_note_events_on_services_spec.rb
+++ b/spec/migrations/active_record/schedule_set_confidential_note_events_on_services_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180122154930_schedule_set_confidential_note_events_on_services.rb')
 
-describe ScheduleSetConfidentialNoteEventsOnServices, :migration do
+describe ScheduleSetConfidentialNoteEventsOnServices do
   let(:services_table) { table(:services) }
   let(:migration_class) { Gitlab::BackgroundMigration::SetConfidentialNoteEventsOnServices }
   let(:migration_name)  { migration_class.to_s.demodulize }
diff --git a/spec/migrations/active_record/schema_spec.rb b/spec/migrations/active_record/schema_spec.rb
index 617e31f359b..086d6317c32 100644
--- a/spec/migrations/active_record/schema_spec.rb
+++ b/spec/migrations/active_record/schema_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 # Check consistency of db/schema.rb version, migrations' timestamps, and the latest migration timestamp
 # stored in the database's schema_migrations table.
 
-describe ActiveRecord::Schema do
+describe ActiveRecord::Schema, schema: :latest do
   let(:latest_migration_timestamp) do
     migrations_paths = %w[db/migrate db/post_migrate]
       .map { |path| Rails.root.join(*path, '*') }
diff --git a/spec/migrations/add_default_and_free_plans_spec.rb b/spec/migrations/add_default_and_free_plans_spec.rb
index ae40b5b10c2..dffdeb8e71a 100644
--- a/spec/migrations/add_default_and_free_plans_spec.rb
+++ b/spec/migrations/add_default_and_free_plans_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20191023152913_add_default_and_free_plans.rb')
 
-describe AddDefaultAndFreePlans, :migration do
+describe AddDefaultAndFreePlans do
   describe 'migrate' do
     let(:plans) { table(:plans) }
 
diff --git a/spec/migrations/add_deploy_token_type_to_deploy_tokens_spec.rb b/spec/migrations/add_deploy_token_type_to_deploy_tokens_spec.rb
index fb8213a6bd6..3bc3d3f8ee2 100644
--- a/spec/migrations/add_deploy_token_type_to_deploy_tokens_spec.rb
+++ b/spec/migrations/add_deploy_token_type_to_deploy_tokens_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20200122161638_add_deploy_token_type_to_deploy_tokens.rb')
 
-describe AddDeployTokenTypeToDeployTokens, :migration do
+describe AddDeployTokenTypeToDeployTokens do
   let(:deploy_tokens) { table(:deploy_tokens) }
   let(:deploy_token) do
     deploy_tokens.create(name: 'token_test',
diff --git a/spec/migrations/add_foreign_key_from_notification_settings_to_users_spec.rb b/spec/migrations/add_foreign_key_from_notification_settings_to_users_spec.rb
index 656d4f75e3b..ceca38b148e 100644
--- a/spec/migrations/add_foreign_key_from_notification_settings_to_users_spec.rb
+++ b/spec/migrations/add_foreign_key_from_notification_settings_to_users_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180710162338_add_foreign_key_from_notification_settings_to_users.rb')
 
-describe AddForeignKeyFromNotificationSettingsToUsers, :migration do
+describe AddForeignKeyFromNotificationSettingsToUsers do
   let(:notification_settings) { table(:notification_settings) }
   let(:users) { table(:users) }
   let(:projects) { table(:projects) }
diff --git a/spec/migrations/add_foreign_keys_to_todos_spec.rb b/spec/migrations/add_foreign_keys_to_todos_spec.rb
index 9932113a003..49fb3c1a911 100644
--- a/spec/migrations/add_foreign_keys_to_todos_spec.rb
+++ b/spec/migrations/add_foreign_keys_to_todos_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180201110056_add_foreign_keys_to_todos.rb')
 
-describe AddForeignKeysToTodos, :migration do
+describe AddForeignKeysToTodos do
   let(:todos) { table(:todos) }
   let(:users) { table(:users) }
   let(:projects) { table(:projects) }
diff --git a/spec/migrations/add_not_null_constraint_to_project_mirror_data_foreign_key_spec.rb b/spec/migrations/add_not_null_constraint_to_project_mirror_data_foreign_key_spec.rb
index 24ae939afa7..03f65aba7c0 100644
--- a/spec/migrations/add_not_null_constraint_to_project_mirror_data_foreign_key_spec.rb
+++ b/spec/migrations/add_not_null_constraint_to_project_mirror_data_foreign_key_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180508100222_add_not_null_constraint_to_project_mirror_data_foreign_key.rb')
 
-describe AddNotNullConstraintToProjectMirrorDataForeignKey, :migration do
+describe AddNotNullConstraintToProjectMirrorDataForeignKey do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:import_state) { table(:project_mirror_data) }
diff --git a/spec/migrations/add_pages_access_level_to_project_feature_spec.rb b/spec/migrations/add_pages_access_level_to_project_feature_spec.rb
index a5e2bf2de71..69f1e3ba3d0 100644
--- a/spec/migrations/add_pages_access_level_to_project_feature_spec.rb
+++ b/spec/migrations/add_pages_access_level_to_project_feature_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180423204600_add_pages_access_level_to_project_feature.rb')
 
-describe AddPagesAccessLevelToProjectFeature, :migration do
+describe AddPagesAccessLevelToProjectFeature do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:features) { table(:project_features) }
diff --git a/spec/migrations/add_pipeline_build_foreign_key_spec.rb b/spec/migrations/add_pipeline_build_foreign_key_spec.rb
index bb40ead9b93..dd0189b6bfc 100644
--- a/spec/migrations/add_pipeline_build_foreign_key_spec.rb
+++ b/spec/migrations/add_pipeline_build_foreign_key_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180420010016_add_pipeline_build_foreign_key.rb')
 
-describe AddPipelineBuildForeignKey, :migration do
+describe AddPipelineBuildForeignKey do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:pipelines) { table(:ci_pipelines) }
diff --git a/spec/migrations/add_temporary_partial_index_on_project_id_to_services_spec.rb b/spec/migrations/add_temporary_partial_index_on_project_id_to_services_spec.rb
index 2d12fec5cb3..ce790b0266c 100644
--- a/spec/migrations/add_temporary_partial_index_on_project_id_to_services_spec.rb
+++ b/spec/migrations/add_temporary_partial_index_on_project_id_to_services_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200114112932_add_temporary_partial_index_on_project_id_to_services.rb')
 
-describe AddTemporaryPartialIndexOnProjectIdToServices, :migration do
+describe AddTemporaryPartialIndexOnProjectIdToServices do
   let(:migration) { described_class.new }
 
   describe '#up' do
diff --git a/spec/migrations/add_unique_constraint_to_approvals_user_id_and_merge_request_id_spec.rb b/spec/migrations/add_unique_constraint_to_approvals_user_id_and_merge_request_id_spec.rb
index cad10ba30ef..74830ab4ce2 100644
--- a/spec/migrations/add_unique_constraint_to_approvals_user_id_and_merge_request_id_spec.rb
+++ b/spec/migrations/add_unique_constraint_to_approvals_user_id_and_merge_request_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190404143330_add_unique_constraint_to_approvals_user_id_and_merge_request_id.rb')
 
-describe AddUniqueConstraintToApprovalsUserIdAndMergeRequestId, :migration do
+describe AddUniqueConstraintToApprovalsUserIdAndMergeRequestId do
   let(:migration) { described_class.new }
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
diff --git a/spec/migrations/add_unique_constraint_to_project_features_project_id_spec.rb b/spec/migrations/add_unique_constraint_to_project_features_project_id_spec.rb
index 8b128ff5ab8..91abf0f7d1c 100644
--- a/spec/migrations/add_unique_constraint_to_project_features_project_id_spec.rb
+++ b/spec/migrations/add_unique_constraint_to_project_features_project_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180511174224_add_unique_constraint_to_project_features_project_id.rb')
 
-describe AddUniqueConstraintToProjectFeaturesProjectId, :migration do
+describe AddUniqueConstraintToProjectFeaturesProjectId do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:features) { table(:project_features) }
diff --git a/spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb b/spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb
index 17342dcaab3..e9ef6bf3e2d 100644
--- a/spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb
+++ b/spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180425131009_assure_commits_count_for_merge_request_diff.rb')
 
-describe AssureCommitsCountForMergeRequestDiff, :migration, :redis do
+describe AssureCommitsCountForMergeRequestDiff, :redis do
   let(:migration) { spy('migration') }
 
   before do
diff --git a/spec/migrations/backfill_and_add_not_null_constraint_to_released_at_column_on_releases_table_spec.rb b/spec/migrations/backfill_and_add_not_null_constraint_to_released_at_column_on_releases_table_spec.rb
index 9cae1daacea..8fceba276ce 100644
--- a/spec/migrations/backfill_and_add_not_null_constraint_to_released_at_column_on_releases_table_spec.rb
+++ b/spec/migrations/backfill_and_add_not_null_constraint_to_released_at_column_on_releases_table_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20190628185004_backfill_and_add_not_null_constraint_to_released_at_column_on_releases_table.rb')
 
-describe BackfillAndAddNotNullConstraintToReleasedAtColumnOnReleasesTable, :migration do
+describe BackfillAndAddNotNullConstraintToReleasedAtColumnOnReleasesTable do
   let(:releases)   { table(:releases) }
   let(:namespaces) { table(:namespaces) }
   let(:projects)   { table(:projects) }
diff --git a/spec/migrations/backfill_operations_feature_flags_active_spec.rb b/spec/migrations/backfill_operations_feature_flags_active_spec.rb
index ad69b776052..c51ed9fea8c 100644
--- a/spec/migrations/backfill_operations_feature_flags_active_spec.rb
+++ b/spec/migrations/backfill_operations_feature_flags_active_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20191213184609_backfill_operations_feature_flags_active.rb')
 
-describe BackfillOperationsFeatureFlagsActive, :migration do
+describe BackfillOperationsFeatureFlagsActive do
   let(:namespaces)   { table(:namespaces) }
   let(:projects)     { table(:projects) }
   let(:flags)        { table(:operations_feature_flags) }
diff --git a/spec/migrations/backfill_operations_feature_flags_iid_spec.rb b/spec/migrations/backfill_operations_feature_flags_iid_spec.rb
index f7a223e794a..4628780787c 100644
--- a/spec/migrations/backfill_operations_feature_flags_iid_spec.rb
+++ b/spec/migrations/backfill_operations_feature_flags_iid_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200117194850_backfill_operations_feature_flags_iid.rb')
 
-describe BackfillOperationsFeatureFlagsIid, :migration do
+describe BackfillOperationsFeatureFlagsIid do
   let(:namespaces)   { table(:namespaces) }
   let(:projects)     { table(:projects) }
   let(:flags)        { table(:operations_feature_flags) }
diff --git a/spec/migrations/backfill_releases_name_with_tag_name_spec.rb b/spec/migrations/backfill_releases_name_with_tag_name_spec.rb
index 6f436de84b7..b38b8dff3fa 100644
--- a/spec/migrations/backfill_releases_name_with_tag_name_spec.rb
+++ b/spec/migrations/backfill_releases_name_with_tag_name_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20181212104941_backfill_releases_name_with_tag_name.rb')
 
-describe BackfillReleasesNameWithTagName, :migration do
+describe BackfillReleasesNameWithTagName do
   let(:releases)   { table(:releases) }
   let(:namespaces) { table(:namespaces) }
   let(:projects)   { table(:projects) }
diff --git a/spec/migrations/backfill_releases_table_updated_at_and_add_not_null_constraints_to_timestamps_spec.rb b/spec/migrations/backfill_releases_table_updated_at_and_add_not_null_constraints_to_timestamps_spec.rb
index 3ca7af8ea37..bf9a8154e1e 100644
--- a/spec/migrations/backfill_releases_table_updated_at_and_add_not_null_constraints_to_timestamps_spec.rb
+++ b/spec/migrations/backfill_releases_table_updated_at_and_add_not_null_constraints_to_timestamps_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20190920194925_backfill_releases_table_updated_at_and_add_not_null_constraints_to_timestamps.rb')
 
-describe BackfillReleasesTableUpdatedAtAndAddNotNullConstraintsToTimestamps, :migration do
+describe BackfillReleasesTableUpdatedAtAndAddNotNullConstraintsToTimestamps do
   let(:releases)   { table(:releases) }
   let(:namespaces) { table(:namespaces) }
   let(:projects)   { table(:projects) }
diff --git a/spec/migrations/backfill_store_project_full_path_in_repo_spec.rb b/spec/migrations/backfill_store_project_full_path_in_repo_spec.rb
index 913b4d3f114..a2adde37f11 100644
--- a/spec/migrations/backfill_store_project_full_path_in_repo_spec.rb
+++ b/spec/migrations/backfill_store_project_full_path_in_repo_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 require Rails.root.join('db', 'post_migrate', '20181010133639_backfill_store_project_full_path_in_repo.rb')
 
-describe BackfillStoreProjectFullPathInRepo, :migration do
+describe BackfillStoreProjectFullPathInRepo do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:group) { namespaces.create!(name: 'foo', path: 'foo') }
diff --git a/spec/migrations/backport_enterprise_schema_spec.rb b/spec/migrations/backport_enterprise_schema_spec.rb
index 8d2d9d4953a..c167301e1e3 100644
--- a/spec/migrations/backport_enterprise_schema_spec.rb
+++ b/spec/migrations/backport_enterprise_schema_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 require Rails.root.join('db', 'migrate', '20190402150158_backport_enterprise_schema.rb')
 
-describe BackportEnterpriseSchema, :migration, schema: 20190329085614 do
+describe BackportEnterpriseSchema, schema: 20190329085614 do
   include MigrationsHelpers
 
   def drop_if_exists(table)
diff --git a/spec/migrations/change_default_value_for_dsa_key_restriction_spec.rb b/spec/migrations/change_default_value_for_dsa_key_restriction_spec.rb
index 699708ad1d4..448f1e2106e 100644
--- a/spec/migrations/change_default_value_for_dsa_key_restriction_spec.rb
+++ b/spec/migrations/change_default_value_for_dsa_key_restriction_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180531220618_change_default_value_for_dsa_key_restriction.rb')
 
-describe ChangeDefaultValueForDsaKeyRestriction, :migration do
+describe ChangeDefaultValueForDsaKeyRestriction do
   let(:application_settings) { table(:application_settings) }
 
   before do
diff --git a/spec/migrations/change_outbound_local_requests_whitelist_default_spec.rb b/spec/migrations/change_outbound_local_requests_whitelist_default_spec.rb
index 232f6f090c3..dd45cac4a70 100644
--- a/spec/migrations/change_outbound_local_requests_whitelist_default_spec.rb
+++ b/spec/migrations/change_outbound_local_requests_whitelist_default_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20190725012225_change_outbound_local_requests_whitelist_default.rb')
 
-describe ChangeOutboundLocalRequestsWhitelistDefault, :migration do
+describe ChangeOutboundLocalRequestsWhitelistDefault do
   let(:application_settings) { table(:application_settings) }
 
   it 'defaults to empty array' do
diff --git a/spec/migrations/change_packages_size_defaults_in_project_statistics_spec.rb b/spec/migrations/change_packages_size_defaults_in_project_statistics_spec.rb
index 93e7e9304b1..c36506643de 100644
--- a/spec/migrations/change_packages_size_defaults_in_project_statistics_spec.rb
+++ b/spec/migrations/change_packages_size_defaults_in_project_statistics_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20190516155724_change_packages_size_defaults_in_project_statistics.rb')
 
-describe ChangePackagesSizeDefaultsInProjectStatistics, :migration do
+describe ChangePackagesSizeDefaultsInProjectStatistics do
   let(:project_statistics) { table(:project_statistics) }
   let(:projects)           { table(:projects) }
 
diff --git a/spec/migrations/clean_grafana_url_spec.rb b/spec/migrations/clean_grafana_url_spec.rb
index 9f060fbaf7d..f6ea88a6f8d 100644
--- a/spec/migrations/clean_grafana_url_spec.rb
+++ b/spec/migrations/clean_grafana_url_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20200214085940_clean_grafana_url.rb')
 
-describe CleanGrafanaUrl, :migration do
+describe CleanGrafanaUrl do
   let(:application_settings_table) { table(:application_settings) }
 
   [
diff --git a/spec/migrations/clean_up_noteable_id_for_notes_on_commits_spec.rb b/spec/migrations/clean_up_noteable_id_for_notes_on_commits_spec.rb
index 572b7dfd0c8..602e1c1fe93 100644
--- a/spec/migrations/clean_up_noteable_id_for_notes_on_commits_spec.rb
+++ b/spec/migrations/clean_up_noteable_id_for_notes_on_commits_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190313092516_clean_up_noteable_id_for_notes_on_commits.rb')
 
-describe CleanUpNoteableIdForNotesOnCommits, :migration do
+describe CleanUpNoteableIdForNotesOnCommits do
   let(:notes) { table(:notes) }
 
   before do
diff --git a/spec/migrations/cleanup_build_stage_migration_spec.rb b/spec/migrations/cleanup_build_stage_migration_spec.rb
index 2142b7b5275..961e719e2fc 100644
--- a/spec/migrations/cleanup_build_stage_migration_spec.rb
+++ b/spec/migrations/cleanup_build_stage_migration_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180420010616_cleanup_build_stage_migration.rb')
 
-describe CleanupBuildStageMigration, :migration, :redis do
+describe CleanupBuildStageMigration, :redis do
   let(:migration) { spy('migration') }
 
   before do
diff --git a/spec/migrations/cleanup_environments_external_url_spec.rb b/spec/migrations/cleanup_environments_external_url_spec.rb
index bc20f936593..54fcb8c62cd 100644
--- a/spec/migrations/cleanup_environments_external_url_spec.rb
+++ b/spec/migrations/cleanup_environments_external_url_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20181108091549_cleanup_environments_external_url.rb')
 
-describe CleanupEnvironmentsExternalUrl, :migration do
+describe CleanupEnvironmentsExternalUrl do
   let(:environments)    { table(:environments) }
   let(:invalid_entries) { environments.where(environments.arel_table[:external_url].matches('javascript://%')) }
   let(:namespaces)      { table(:namespaces) }
diff --git a/spec/migrations/cleanup_legacy_artifact_migration_spec.rb b/spec/migrations/cleanup_legacy_artifact_migration_spec.rb
index 0ab7d7ec05f..29a5c34373c 100644
--- a/spec/migrations/cleanup_legacy_artifact_migration_spec.rb
+++ b/spec/migrations/cleanup_legacy_artifact_migration_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20190104182041_cleanup_legacy_artifact_migration.rb')
 
-describe CleanupLegacyArtifactMigration, :migration, :redis do
+describe CleanupLegacyArtifactMigration, :redis do
   let(:migration) { spy('migration') }
 
   context 'when still legacy artifacts exist' do
diff --git a/spec/migrations/cleanup_optimistic_locking_nulls_spec.rb b/spec/migrations/cleanup_optimistic_locking_nulls_spec.rb
index bec8435b2f0..d32a374b914 100644
--- a/spec/migrations/cleanup_optimistic_locking_nulls_spec.rb
+++ b/spec/migrations/cleanup_optimistic_locking_nulls_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200128210353_cleanup_optimistic_locking_nulls')
 
-describe CleanupOptimisticLockingNulls, :migration do
+describe CleanupOptimisticLockingNulls do
   TABLES = %w(epics merge_requests issues).freeze
   TABLES.each do |table|
     let(table.to_sym) { table(table.to_sym) }
diff --git a/spec/migrations/cleanup_stages_position_migration_spec.rb b/spec/migrations/cleanup_stages_position_migration_spec.rb
index c2077629919..62b9c4e84e3 100644
--- a/spec/migrations/cleanup_stages_position_migration_spec.rb
+++ b/spec/migrations/cleanup_stages_position_migration_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180604123514_cleanup_stages_position_migration.rb')
 
-describe CleanupStagesPositionMigration, :migration, :redis do
+describe CleanupStagesPositionMigration, :redis do
   let(:migration) { spy('migration') }
 
   before do
diff --git a/spec/migrations/create_environment_for_self_monitoring_project_spec.rb b/spec/migrations/create_environment_for_self_monitoring_project_spec.rb
index ba1081c5006..aee0651dee0 100644
--- a/spec/migrations/create_environment_for_self_monitoring_project_spec.rb
+++ b/spec/migrations/create_environment_for_self_monitoring_project_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200214214934_create_environment_for_self_monitoring_project')
 
-describe CreateEnvironmentForSelfMonitoringProject, :migration do
+describe CreateEnvironmentForSelfMonitoringProject do
   let(:application_settings_table) { table(:application_settings) }
 
   let(:environments) { table(:environments) }
diff --git a/spec/migrations/create_missing_namespace_for_internal_users_spec.rb b/spec/migrations/create_missing_namespace_for_internal_users_spec.rb
index 5df08a74e56..0872f23c02e 100644
--- a/spec/migrations/create_missing_namespace_for_internal_users_spec.rb
+++ b/spec/migrations/create_missing_namespace_for_internal_users_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180413022611_create_missing_namespace_for_internal_users.rb')
 
-describe CreateMissingNamespaceForInternalUsers, :migration do
+describe CreateMissingNamespaceForInternalUsers do
   let(:users) { table(:users) }
   let(:namespaces) { table(:namespaces) }
   let(:routes) { table(:routes) }
diff --git a/spec/migrations/delete_internal_ids_where_feature_flags_usage_spec.rb b/spec/migrations/delete_internal_ids_where_feature_flags_usage_spec.rb
index b9c6b489aca..6eecd0870ed 100644
--- a/spec/migrations/delete_internal_ids_where_feature_flags_usage_spec.rb
+++ b/spec/migrations/delete_internal_ids_where_feature_flags_usage_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200117194900_delete_internal_ids_where_feature_flags_usage')
 
-describe DeleteInternalIdsWhereFeatureFlagsUsage, :migration do
+describe DeleteInternalIdsWhereFeatureFlagsUsage do
   let(:namespaces)   { table(:namespaces) }
   let(:projects)     { table(:projects) }
   let(:internal_ids) { table(:internal_ids) }
diff --git a/spec/migrations/delete_template_services_duplicated_by_type_spec.rb b/spec/migrations/delete_template_services_duplicated_by_type_spec.rb
index 80645b1f162..64da0664e2c 100644
--- a/spec/migrations/delete_template_services_duplicated_by_type_spec.rb
+++ b/spec/migrations/delete_template_services_duplicated_by_type_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20200304160801_delete_template_services_duplicated_by_type.rb')
 
-describe DeleteTemplateServicesDuplicatedByType, :migration do
+describe DeleteTemplateServicesDuplicatedByType do
   let(:services) { table(:services) }
 
   before do
diff --git a/spec/migrations/drop_activate_prometheus_services_background_jobs_spec.rb b/spec/migrations/drop_activate_prometheus_services_background_jobs_spec.rb
index 0e9a3418e29..a02a0819a7b 100644
--- a/spec/migrations/drop_activate_prometheus_services_background_jobs_spec.rb
+++ b/spec/migrations/drop_activate_prometheus_services_background_jobs_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20200221144534_drop_activate_prometheus_services_background_jobs.rb')
 
-describe DropActivatePrometheusServicesBackgroundJobs, :sidekiq, :redis, :migration, schema: 2020_02_21_144534 do
+describe DropActivatePrometheusServicesBackgroundJobs, :sidekiq, :redis, schema: 2020_02_21_144534 do
   subject(:migration) { described_class.new }
 
   describe '#up' do
diff --git a/spec/migrations/drop_background_migration_jobs_spec.rb b/spec/migrations/drop_background_migration_jobs_spec.rb
index ac76e897f6c..d9e0561f326 100644
--- a/spec/migrations/drop_background_migration_jobs_spec.rb
+++ b/spec/migrations/drop_background_migration_jobs_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20200116051619_drop_background_migration_jobs.rb')
 
-describe DropBackgroundMigrationJobs, :sidekiq, :redis, :migration, schema: 2020_01_16_051619 do
+describe DropBackgroundMigrationJobs, :sidekiq, :redis, schema: 2020_01_16_051619 do
   subject(:migration) { described_class.new }
 
   describe '#up' do
diff --git a/spec/migrations/drop_duplicate_protected_tags_spec.rb b/spec/migrations/drop_duplicate_protected_tags_spec.rb
index 7f0c7efbf66..7135a15484c 100644
--- a/spec/migrations/drop_duplicate_protected_tags_spec.rb
+++ b/spec/migrations/drop_duplicate_protected_tags_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180711103851_drop_duplicate_protected_tags.rb')
 
-describe DropDuplicateProtectedTags, :migration do
+describe DropDuplicateProtectedTags do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:protected_tags) { table(:protected_tags) }
diff --git a/spec/migrations/drop_project_ci_cd_settings_merge_trains_enabled_spec.rb b/spec/migrations/drop_project_ci_cd_settings_merge_trains_enabled_spec.rb
index 1b0e6e140ca..9166f626922 100644
--- a/spec/migrations/drop_project_ci_cd_settings_merge_trains_enabled_spec.rb
+++ b/spec/migrations/drop_project_ci_cd_settings_merge_trains_enabled_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20191128162854_drop_project_ci_cd_settings_merge_trains_enabled.rb')
 
-describe DropProjectCiCdSettingsMergeTrainsEnabled, :migration do
+describe DropProjectCiCdSettingsMergeTrainsEnabled do
   let!(:project_ci_cd_setting) { table(:project_ci_cd_settings) }
 
   it 'correctly migrates up and down' do
diff --git a/spec/migrations/encrypt_deploy_tokens_tokens_spec.rb b/spec/migrations/encrypt_deploy_tokens_tokens_spec.rb
index a398e079731..4d0a0b31571 100644
--- a/spec/migrations/encrypt_deploy_tokens_tokens_spec.rb
+++ b/spec/migrations/encrypt_deploy_tokens_tokens_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 require Rails.root.join('db', 'post_migrate', '20190711201818_encrypt_deploy_tokens_tokens.rb')
 
-describe EncryptDeployTokensTokens, :migration do
+describe EncryptDeployTokensTokens do
   let(:migration) { described_class.new }
   let(:deployment_tokens) { table(:deploy_tokens) }
   let(:plaintext) { "secret-token" }
diff --git a/spec/migrations/encrypt_feature_flags_clients_tokens_spec.rb b/spec/migrations/encrypt_feature_flags_clients_tokens_spec.rb
index 95b02d20594..9b139c4b57b 100644
--- a/spec/migrations/encrypt_feature_flags_clients_tokens_spec.rb
+++ b/spec/migrations/encrypt_feature_flags_clients_tokens_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190606175050_encrypt_feature_flags_clients_tokens.rb')
 
-describe EncryptFeatureFlagsClientsTokens, :migration do
+describe EncryptFeatureFlagsClientsTokens do
   let(:migration) { described_class.new }
   let(:feature_flags_clients) { table(:operations_feature_flags_clients) }
   let(:projects) { table(:projects) }
diff --git a/spec/migrations/encrypt_plaintext_attributes_on_application_settings_spec.rb b/spec/migrations/encrypt_plaintext_attributes_on_application_settings_spec.rb
index 122da7b3d72..87a72ed0cf5 100644
--- a/spec/migrations/encrypt_plaintext_attributes_on_application_settings_spec.rb
+++ b/spec/migrations/encrypt_plaintext_attributes_on_application_settings_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20191120115530_encrypt_plaintext_attributes_on_application_settings.rb')
 
-describe EncryptPlaintextAttributesOnApplicationSettings, :migration do
+describe EncryptPlaintextAttributesOnApplicationSettings do
   let(:migration) { described_class.new }
   let(:application_settings) { table(:application_settings) }
   let(:plaintext) { 'secret-token' }
diff --git a/spec/migrations/enqueue_reset_merge_status_second_run_spec.rb b/spec/migrations/enqueue_reset_merge_status_second_run_spec.rb
index bdc248f2cf2..d4cf3d15758 100644
--- a/spec/migrations/enqueue_reset_merge_status_second_run_spec.rb
+++ b/spec/migrations/enqueue_reset_merge_status_second_run_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190620112608_enqueue_reset_merge_status_second_run.rb')
 
-describe EnqueueResetMergeStatusSecondRun, :migration do
+describe EnqueueResetMergeStatusSecondRun do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab-org') }
diff --git a/spec/migrations/enqueue_reset_merge_status_spec.rb b/spec/migrations/enqueue_reset_merge_status_spec.rb
index 4b312a3bc62..9728ada14ba 100644
--- a/spec/migrations/enqueue_reset_merge_status_spec.rb
+++ b/spec/migrations/enqueue_reset_merge_status_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190528180441_enqueue_reset_merge_status.rb')
 
-describe EnqueueResetMergeStatus, :migration do
+describe EnqueueResetMergeStatus do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab-org') }
diff --git a/spec/migrations/enqueue_verify_pages_domain_workers_spec.rb b/spec/migrations/enqueue_verify_pages_domain_workers_spec.rb
index 8efaab871a1..ffb1c04a6c5 100644
--- a/spec/migrations/enqueue_verify_pages_domain_workers_spec.rb
+++ b/spec/migrations/enqueue_verify_pages_domain_workers_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180216121030_enqueue_verify_pages_domain_workers')
 
-describe EnqueueVerifyPagesDomainWorkers, :migration do
+describe EnqueueVerifyPagesDomainWorkers do
   around do |example|
     Sidekiq::Testing.fake! do
       example.run
diff --git a/spec/migrations/fill_empty_finished_at_in_deployments_spec.rb b/spec/migrations/fill_empty_finished_at_in_deployments_spec.rb
index 50ecf083f27..546a805dec8 100644
--- a/spec/migrations/fill_empty_finished_at_in_deployments_spec.rb
+++ b/spec/migrations/fill_empty_finished_at_in_deployments_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20181030135124_fill_empty_finished_at_in_deployments')
 
-describe FillEmptyFinishedAtInDeployments, :migration do
+describe FillEmptyFinishedAtInDeployments do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:environments) { table(:environments) }
diff --git a/spec/migrations/fill_file_store_spec.rb b/spec/migrations/fill_file_store_spec.rb
index 806c9283634..732fdc2a0bb 100644
--- a/spec/migrations/fill_file_store_spec.rb
+++ b/spec/migrations/fill_file_store_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180424151928_fill_file_store')
 
-describe FillFileStore, :migration do
+describe FillFileStore do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:builds) { table(:ci_builds) }
diff --git a/spec/migrations/fill_productivity_analytics_start_date_spec.rb b/spec/migrations/fill_productivity_analytics_start_date_spec.rb
index 7cbba9ef20e..4ae7b0eed24 100644
--- a/spec/migrations/fill_productivity_analytics_start_date_spec.rb
+++ b/spec/migrations/fill_productivity_analytics_start_date_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20191004081520_fill_productivity_analytics_start_date.rb')
 
-describe FillProductivityAnalyticsStartDate, :migration do
+describe FillProductivityAnalyticsStartDate do
   let(:settings_table) { table('application_settings') }
   let(:metrics_table) { table('merge_request_metrics') }
 
diff --git a/spec/migrations/fix_max_pages_size_spec.rb b/spec/migrations/fix_max_pages_size_spec.rb
index 36b5445603e..9882cda7fba 100644
--- a/spec/migrations/fix_max_pages_size_spec.rb
+++ b/spec/migrations/fix_max_pages_size_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20191213120427_fix_max_pages_size.rb')
 
-describe FixMaxPagesSize, :migration do
+describe FixMaxPagesSize do
   let(:application_settings) { table(:application_settings) }
   let!(:default_setting) { application_settings.create! }
   let!(:max_possible_setting) { application_settings.create!(max_pages_size: described_class::MAX_SIZE) }
diff --git a/spec/migrations/fix_null_type_labels_spec.rb b/spec/migrations/fix_null_type_labels_spec.rb
index 462ae9b913f..b098141c5e9 100644
--- a/spec/migrations/fix_null_type_labels_spec.rb
+++ b/spec/migrations/fix_null_type_labels_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190131122559_fix_null_type_labels')
 
-describe FixNullTypeLabels, :migration do
+describe FixNullTypeLabels do
   let(:migration) { described_class.new }
   let(:projects) { table(:projects) }
   let(:namespaces) { table(:namespaces) }
diff --git a/spec/migrations/fix_pool_repository_source_project_id_spec.rb b/spec/migrations/fix_pool_repository_source_project_id_spec.rb
index 8ddee9bb575..5a878dba6e7 100644
--- a/spec/migrations/fix_pool_repository_source_project_id_spec.rb
+++ b/spec/migrations/fix_pool_repository_source_project_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20190604184643_fix_pool_repository_source_project_id.rb')
 
-describe FixPoolRepositorySourceProjectId, :migration do
+describe FixPoolRepositorySourceProjectId do
   let(:projects) { table(:projects) }
   let(:pool_repositories) { table(:pool_repositories) }
   let(:shards) { table(:shards) }
diff --git a/spec/migrations/fix_projects_without_project_feature_spec.rb b/spec/migrations/fix_projects_without_project_feature_spec.rb
index 6e0345da078..01413261008 100644
--- a/spec/migrations/fix_projects_without_project_feature_spec.rb
+++ b/spec/migrations/fix_projects_without_project_feature_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200127111840_fix_projects_without_project_feature.rb')
 
-describe FixProjectsWithoutProjectFeature, :migration do
+describe FixProjectsWithoutProjectFeature do
   let(:namespace) { table(:namespaces).create(name: 'gitlab', path: 'gitlab-org') }
 
   let!(:projects) do
diff --git a/spec/migrations/fix_wrong_pages_access_level_spec.rb b/spec/migrations/fix_wrong_pages_access_level_spec.rb
index 73d8218b95c..e0d09add740 100644
--- a/spec/migrations/fix_wrong_pages_access_level_spec.rb
+++ b/spec/migrations/fix_wrong_pages_access_level_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190703185326_fix_wrong_pages_access_level.rb')
 
-describe FixWrongPagesAccessLevel, :migration, :sidekiq_might_not_need_inline, schema: 20190628185004 do
+describe FixWrongPagesAccessLevel, :sidekiq_might_not_need_inline, schema: 20190628185004 do
   using RSpec::Parameterized::TableSyntax
 
   let(:migration_class) { described_class::MIGRATION }
diff --git a/spec/migrations/generate_lets_encrypt_private_key_spec.rb b/spec/migrations/generate_lets_encrypt_private_key_spec.rb
index 7746ba46446..c0cb39fd519 100644
--- a/spec/migrations/generate_lets_encrypt_private_key_spec.rb
+++ b/spec/migrations/generate_lets_encrypt_private_key_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20190524062810_generate_lets_encrypt_private_key.rb')
 
-describe GenerateLetsEncryptPrivateKey, :migration do
+describe GenerateLetsEncryptPrivateKey do
   describe '#up' do
     it 'does not fail' do
       expect do
diff --git a/spec/migrations/generate_missing_routes_spec.rb b/spec/migrations/generate_missing_routes_spec.rb
index a4a25951ff0..3ff220aa8d3 100644
--- a/spec/migrations/generate_missing_routes_spec.rb
+++ b/spec/migrations/generate_missing_routes_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180702134423_generate_missing_routes.rb')
 
-describe GenerateMissingRoutes, :migration do
+describe GenerateMissingRoutes do
   describe '#up' do
     let(:namespaces) { table(:namespaces) }
     let(:projects) { table(:projects) }
diff --git a/spec/migrations/import_common_metrics_spec.rb b/spec/migrations/import_common_metrics_spec.rb
index 1001629007c..8c28b46cb38 100644
--- a/spec/migrations/import_common_metrics_spec.rb
+++ b/spec/migrations/import_common_metrics_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180831164910_import_common_metrics.rb')
 
-describe ImportCommonMetrics, :migration do
+describe ImportCommonMetrics do
   describe '#up' do
     it "imports all prometheus metrics" do
       expect(PrometheusMetric.common).to be_empty
diff --git a/spec/migrations/insert_project_hooks_plan_limits_spec.rb b/spec/migrations/insert_project_hooks_plan_limits_spec.rb
index abc2ccd0507..e4bdda4cf5e 100644
--- a/spec/migrations/insert_project_hooks_plan_limits_spec.rb
+++ b/spec/migrations/insert_project_hooks_plan_limits_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20191216183532_insert_project_hooks_plan_limits.rb')
 
-describe InsertProjectHooksPlanLimits, :migration do
+describe InsertProjectHooksPlanLimits do
   let(:migration) { described_class.new }
   let(:plans) { table(:plans) }
   let(:plan_limits) { table(:plan_limits) }
diff --git a/spec/migrations/migrate_auto_dev_ops_domain_to_cluster_domain_spec.rb b/spec/migrations/migrate_auto_dev_ops_domain_to_cluster_domain_spec.rb
index 349cffea70e..9188c19f76a 100644
--- a/spec/migrations/migrate_auto_dev_ops_domain_to_cluster_domain_spec.rb
+++ b/spec/migrations/migrate_auto_dev_ops_domain_to_cluster_domain_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190204115450_migrate_auto_dev_ops_domain_to_cluster_domain.rb')
 
-describe MigrateAutoDevOpsDomainToClusterDomain, :migration do
+describe MigrateAutoDevOpsDomainToClusterDomain do
   include MigrationHelpers::ClusterHelpers
 
   let(:migration) { described_class.new }
diff --git a/spec/migrations/migrate_code_owner_approval_status_to_protected_branches_in_batches_spec.rb b/spec/migrations/migrate_code_owner_approval_status_to_protected_branches_in_batches_spec.rb
index 67ac40d4d39..cda965135b0 100644
--- a/spec/migrations/migrate_code_owner_approval_status_to_protected_branches_in_batches_spec.rb
+++ b/spec/migrations/migrate_code_owner_approval_status_to_protected_branches_in_batches_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190827102026_migrate_code_owner_approval_status_to_protected_branches_in_batches.rb')
 
-describe MigrateCodeOwnerApprovalStatusToProtectedBranchesInBatches, :migration do
+describe MigrateCodeOwnerApprovalStatusToProtectedBranchesInBatches do
   let(:namespaces)         { table(:namespaces) }
   let(:projects)           { table(:projects) }
   let(:protected_branches) { table(:protected_branches) }
diff --git a/spec/migrations/migrate_discussion_id_on_promoted_epics_spec.rb b/spec/migrations/migrate_discussion_id_on_promoted_epics_spec.rb
index deeea74bd3b..0a8975402da 100644
--- a/spec/migrations/migrate_discussion_id_on_promoted_epics_spec.rb
+++ b/spec/migrations/migrate_discussion_id_on_promoted_epics_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190715193142_migrate_discussion_id_on_promoted_epics.rb')
 
-describe MigrateDiscussionIdOnPromotedEpics, :migration do
+describe MigrateDiscussionIdOnPromotedEpics do
   let(:migration_class) { described_class::MIGRATION }
   let(:migration_name)  { migration_class.to_s.demodulize }
 
diff --git a/spec/migrations/migrate_forbidden_redirect_uris_spec.rb b/spec/migrations/migrate_forbidden_redirect_uris_spec.rb
index 0bc13a3974a..7c3cc9f07c8 100644
--- a/spec/migrations/migrate_forbidden_redirect_uris_spec.rb
+++ b/spec/migrations/migrate_forbidden_redirect_uris_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20181026091631_migrate_forbidden_redirect_uris.rb')
 
-describe MigrateForbiddenRedirectUris, :migration do
+describe MigrateForbiddenRedirectUris do
   let(:oauth_application) { table(:oauth_applications) }
   let(:oauth_access_grant) { table(:oauth_access_grants) }
 
diff --git a/spec/migrations/migrate_k8s_service_integration_spec.rb b/spec/migrations/migrate_k8s_service_integration_spec.rb
index 4dd0c09632a..660e958eb42 100644
--- a/spec/migrations/migrate_k8s_service_integration_spec.rb
+++ b/spec/migrations/migrate_k8s_service_integration_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190517153211_migrate_k8s_service_integration.rb')
 
-describe MigrateK8sServiceIntegration, :migration do
+describe MigrateK8sServiceIntegration do
   context 'template service' do
     context 'with namespace' do
       let!(:service) do
diff --git a/spec/migrations/migrate_legacy_artifacts_to_job_artifacts_spec.rb b/spec/migrations/migrate_legacy_artifacts_to_job_artifacts_spec.rb
index d6259023c01..5133afdf5b0 100644
--- a/spec/migrations/migrate_legacy_artifacts_to_job_artifacts_spec.rb
+++ b/spec/migrations/migrate_legacy_artifacts_to_job_artifacts_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180816161409_migrate_legacy_artifacts_to_job_artifacts.rb')
 
-describe MigrateLegacyArtifactsToJobArtifacts, :migration do
+describe MigrateLegacyArtifactsToJobArtifacts do
   let(:migration_class) { Gitlab::BackgroundMigration::MigrateLegacyArtifacts }
   let(:migration_name)  { migration_class.to_s.demodulize }
 
diff --git a/spec/migrations/migrate_legacy_managed_clusters_to_unmanaged_spec.rb b/spec/migrations/migrate_legacy_managed_clusters_to_unmanaged_spec.rb
index 93426f1f273..e3462e1d6bd 100644
--- a/spec/migrations/migrate_legacy_managed_clusters_to_unmanaged_spec.rb
+++ b/spec/migrations/migrate_legacy_managed_clusters_to_unmanaged_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190606163724_migrate_legacy_managed_clusters_to_unmanaged.rb')
 
-describe MigrateLegacyManagedClustersToUnmanaged, :migration do
+describe MigrateLegacyManagedClustersToUnmanaged do
   let(:cluster_type) { 'project_type' }
   let(:created_at) { 1.hour.ago }
 
diff --git a/spec/migrations/migrate_managed_clusters_with_no_token_to_unmanaged_spec.rb b/spec/migrations/migrate_managed_clusters_with_no_token_to_unmanaged_spec.rb
index b73bd16cb60..2931fba3eb2 100644
--- a/spec/migrations/migrate_managed_clusters_with_no_token_to_unmanaged_spec.rb
+++ b/spec/migrations/migrate_managed_clusters_with_no_token_to_unmanaged_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190613231640_migrate_managed_clusters_with_no_token_to_unmanaged.rb')
 
-describe MigrateManagedClustersWithNoTokenToUnmanaged, :migration do
+describe MigrateManagedClustersWithNoTokenToUnmanaged do
   let(:cluster_type) { 'project_type' }
   let(:created_at) { Date.new(2018, 11, 1).midnight }
 
diff --git a/spec/migrations/migrate_null_wiki_access_levels_spec.rb b/spec/migrations/migrate_null_wiki_access_levels_spec.rb
index f99273072a2..f4753f67e17 100644
--- a/spec/migrations/migrate_null_wiki_access_levels_spec.rb
+++ b/spec/migrations/migrate_null_wiki_access_levels_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180809195358_migrate_null_wiki_access_levels.rb')
 
-describe MigrateNullWikiAccessLevels, :migration do
+describe MigrateNullWikiAccessLevels do
   let(:namespaces) { table('namespaces') }
   let(:projects) { table(:projects) }
   let(:project_features) { table(:project_features) }
diff --git a/spec/migrations/migrate_ops_feature_flags_scopes_target_user_ids_spec.rb b/spec/migrations/migrate_ops_feature_flags_scopes_target_user_ids_spec.rb
index 5f865579c96..fc5d814a2de 100644
--- a/spec/migrations/migrate_ops_feature_flags_scopes_target_user_ids_spec.rb
+++ b/spec/migrations/migrate_ops_feature_flags_scopes_target_user_ids_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20191118211629_migrate_ops_feature_flags_scopes_target_user_ids.rb')
 
-describe MigrateOpsFeatureFlagsScopesTargetUserIds, :migration do
+describe MigrateOpsFeatureFlagsScopesTargetUserIds do
   let(:namespaces) { table(:namespaces) }
   let(:projects)   { table(:projects) }
   let(:flags)      { table(:operations_feature_flags) }
diff --git a/spec/migrations/move_limits_from_plans_spec.rb b/spec/migrations/move_limits_from_plans_spec.rb
index 693d6ecb2c1..aeb36100205 100644
--- a/spec/migrations/move_limits_from_plans_spec.rb
+++ b/spec/migrations/move_limits_from_plans_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20191030152934_move_limits_from_plans.rb')
 
-describe MoveLimitsFromPlans, :migration do
+describe MoveLimitsFromPlans do
   let(:plans) { table(:plans) }
   let(:plan_limits) { table(:plan_limits) }
 
diff --git a/spec/migrations/nullify_users_role_spec.rb b/spec/migrations/nullify_users_role_spec.rb
index ad25e4885ef..487d84e2a35 100644
--- a/spec/migrations/nullify_users_role_spec.rb
+++ b/spec/migrations/nullify_users_role_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20191104142124_nullify_users_role.rb')
 
-describe NullifyUsersRole, :migration do
+describe NullifyUsersRole do
   let(:users) { table(:users) }
 
   before do
diff --git a/spec/migrations/populate_project_statistics_packages_size_spec.rb b/spec/migrations/populate_project_statistics_packages_size_spec.rb
index 4ad91342f25..c316a4bc8b7 100644
--- a/spec/migrations/populate_project_statistics_packages_size_spec.rb
+++ b/spec/migrations/populate_project_statistics_packages_size_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190418132125_populate_project_statistics_packages_size.rb')
 
-describe PopulateProjectStatisticsPackagesSize, :migration do
+describe PopulateProjectStatisticsPackagesSize do
   let(:project_statistics) { table(:project_statistics) }
   let(:namespaces)         { table(:namespaces) }
   let(:projects)           { table(:projects) }
diff --git a/spec/migrations/populate_rule_type_on_approval_merge_request_rules_spec.rb b/spec/migrations/populate_rule_type_on_approval_merge_request_rules_spec.rb
index 99dfb165173..d6362528068 100644
--- a/spec/migrations/populate_rule_type_on_approval_merge_request_rules_spec.rb
+++ b/spec/migrations/populate_rule_type_on_approval_merge_request_rules_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190520201748_populate_rule_type_on_approval_merge_request_rules.rb')
 
-describe PopulateRuleTypeOnApprovalMergeRequestRules, :migration do
+describe PopulateRuleTypeOnApprovalMergeRequestRules do
   let(:migration) { described_class.new }
 
   describe '#up' do
diff --git a/spec/migrations/remove_empty_extern_uid_auth0_identities_spec.rb b/spec/migrations/remove_empty_extern_uid_auth0_identities_spec.rb
index ad1bcf37732..5be8706cacf 100644
--- a/spec/migrations/remove_empty_extern_uid_auth0_identities_spec.rb
+++ b/spec/migrations/remove_empty_extern_uid_auth0_identities_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180220150310_remove_empty_extern_uid_auth0_identities.rb')
 
-describe RemoveEmptyExternUidAuth0Identities, :migration do
+describe RemoveEmptyExternUidAuth0Identities do
   let(:identities) { table(:identities) }
 
   before do
diff --git a/spec/migrations/remove_empty_github_service_templates_spec.rb b/spec/migrations/remove_empty_github_service_templates_spec.rb
index c128c8538db..51b29ec6efc 100644
--- a/spec/migrations/remove_empty_github_service_templates_spec.rb
+++ b/spec/migrations/remove_empty_github_service_templates_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20191021101942_remove_empty_github_service_templates.rb')
 
-describe RemoveEmptyGithubServiceTemplates, :migration do
+describe RemoveEmptyGithubServiceTemplates do
   subject(:migration) { described_class.new }
 
   let(:services) do
diff --git a/spec/migrations/remove_packages_deprecated_dependencies_spec.rb b/spec/migrations/remove_packages_deprecated_dependencies_spec.rb
index 0b7efe371a6..2ba7a3b268b 100644
--- a/spec/migrations/remove_packages_deprecated_dependencies_spec.rb
+++ b/spec/migrations/remove_packages_deprecated_dependencies_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20200210135504_remove_packages_deprecated_dependencies.rb')
 
-describe RemovePackagesDeprecatedDependencies, :migration do
+describe RemovePackagesDeprecatedDependencies do
   let(:projects) { table(:projects) }
   let(:packages) { table(:packages_packages) }
   let(:dependency_links) { table(:packages_dependency_links) }
diff --git a/spec/migrations/remove_redundant_pipeline_stages_spec.rb b/spec/migrations/remove_redundant_pipeline_stages_spec.rb
index ad905d7eb8a..9bcbb6022a7 100644
--- a/spec/migrations/remove_redundant_pipeline_stages_spec.rb
+++ b/spec/migrations/remove_redundant_pipeline_stages_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180119121225_remove_redundant_pipeline_stages.rb')
 
-describe RemoveRedundantPipelineStages, :migration do
+describe RemoveRedundantPipelineStages do
   let(:projects) { table(:projects) }
   let(:pipelines) { table(:ci_pipelines) }
   let(:stages) { table(:ci_stages) }
diff --git a/spec/migrations/remove_security_dashboard_feature_flag_spec.rb b/spec/migrations/remove_security_dashboard_feature_flag_spec.rb
index 7ef43134d24..fa0489526e2 100644
--- a/spec/migrations/remove_security_dashboard_feature_flag_spec.rb
+++ b/spec/migrations/remove_security_dashboard_feature_flag_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 require Rails.root.join('db', 'post_migrate', '20200214034836_remove_security_dashboard_feature_flag.rb')
 
-describe RemoveSecurityDashboardFeatureFlag, :migration do
+describe RemoveSecurityDashboardFeatureFlag do
   let(:feature_gates) { table(:feature_gates) }
 
   subject(:migration) { described_class.new }
diff --git a/spec/migrations/rename_security_dashboard_feature_flag_to_instance_security_dashboard_spec.rb b/spec/migrations/rename_security_dashboard_feature_flag_to_instance_security_dashboard_spec.rb
index bc982e8952e..07be7a4ad51 100644
--- a/spec/migrations/rename_security_dashboard_feature_flag_to_instance_security_dashboard_spec.rb
+++ b/spec/migrations/rename_security_dashboard_feature_flag_to_instance_security_dashboard_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 require Rails.root.join('db', 'migrate', '20200212014653_rename_security_dashboard_feature_flag_to_instance_security_dashboard.rb')
 
-describe RenameSecurityDashboardFeatureFlagToInstanceSecurityDashboard, :migration do
+describe RenameSecurityDashboardFeatureFlagToInstanceSecurityDashboard do
   let(:feature_gates) { table(:feature_gates) }
 
   subject(:migration) { described_class.new }
diff --git a/spec/migrations/reschedule_builds_stages_migration_spec.rb b/spec/migrations/reschedule_builds_stages_migration_spec.rb
index 8127934afab..18ea16f97bc 100644
--- a/spec/migrations/reschedule_builds_stages_migration_spec.rb
+++ b/spec/migrations/reschedule_builds_stages_migration_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180405101928_reschedule_builds_stages_migration')
 
-describe RescheduleBuildsStagesMigration, :migration do
+describe RescheduleBuildsStagesMigration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:pipelines) { table(:ci_pipelines) }
diff --git a/spec/migrations/reschedule_commits_count_for_merge_request_diff_spec.rb b/spec/migrations/reschedule_commits_count_for_merge_request_diff_spec.rb
index 0e34e63fcc1..dcb31dff9b7 100644
--- a/spec/migrations/reschedule_commits_count_for_merge_request_diff_spec.rb
+++ b/spec/migrations/reschedule_commits_count_for_merge_request_diff_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180309121820_reschedule_commits_count_for_merge_request_diff')
 
-describe RescheduleCommitsCountForMergeRequestDiff, :migration do
+describe RescheduleCommitsCountForMergeRequestDiff do
   let(:merge_request_diffs) { table(:merge_request_diffs) }
   let(:merge_requests) { table(:merge_requests) }
   let(:projects) { table(:projects) }
diff --git a/spec/migrations/save_instance_administrators_group_id_spec.rb b/spec/migrations/save_instance_administrators_group_id_spec.rb
index eab41017480..74ced009fa5 100644
--- a/spec/migrations/save_instance_administrators_group_id_spec.rb
+++ b/spec/migrations/save_instance_administrators_group_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200210092405_save_instance_administrators_group_id')
 
-describe SaveInstanceAdministratorsGroupId, :migration do
+describe SaveInstanceAdministratorsGroupId do
   let(:application_settings_table) { table(:application_settings) }
 
   let(:instance_administrators_group) do
diff --git a/spec/migrations/schedule_digest_personal_access_tokens_spec.rb b/spec/migrations/schedule_digest_personal_access_tokens_spec.rb
index 915397f0f4f..d8e1b089d31 100644
--- a/spec/migrations/schedule_digest_personal_access_tokens_spec.rb
+++ b/spec/migrations/schedule_digest_personal_access_tokens_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180913142237_schedule_digest_personal_access_tokens.rb')
 
-describe ScheduleDigestPersonalAccessTokens, :migration do
+describe ScheduleDigestPersonalAccessTokens do
   let(:personal_access_tokens) { table(:personal_access_tokens) }
   let(:users) { table(:users) }
 
diff --git a/spec/migrations/schedule_fill_valid_time_for_pages_domain_certificates_spec.rb b/spec/migrations/schedule_fill_valid_time_for_pages_domain_certificates_spec.rb
index 43333ab9837..30cb68c742c 100644
--- a/spec/migrations/schedule_fill_valid_time_for_pages_domain_certificates_spec.rb
+++ b/spec/migrations/schedule_fill_valid_time_for_pages_domain_certificates_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190524073827_schedule_fill_valid_time_for_pages_domain_certificates.rb')
 
-describe ScheduleFillValidTimeForPagesDomainCertificates, :migration do
+describe ScheduleFillValidTimeForPagesDomainCertificates do
   let(:migration_class) { described_class::MIGRATION }
   let(:migration_name)  { migration_class.to_s.demodulize }
 
diff --git a/spec/migrations/schedule_migrate_security_scans_spec.rb b/spec/migrations/schedule_migrate_security_scans_spec.rb
index ae066e8f91c..29e4e2b5cac 100644
--- a/spec/migrations/schedule_migrate_security_scans_spec.rb
+++ b/spec/migrations/schedule_migrate_security_scans_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200217225719_schedule_migrate_security_scans.rb')
 
 # rubocop: disable RSpec/FactoriesInMigrationSpecs
-describe ScheduleMigrateSecurityScans, :migration, :sidekiq do
+describe ScheduleMigrateSecurityScans, :sidekiq do
   let(:migration) { described_class.new }
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
diff --git a/spec/migrations/schedule_pages_metadata_migration_spec.rb b/spec/migrations/schedule_pages_metadata_migration_spec.rb
index bf9442808bc..748b9fe1cd1 100644
--- a/spec/migrations/schedule_pages_metadata_migration_spec.rb
+++ b/spec/migrations/schedule_pages_metadata_migration_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20191002031332_schedule_pages_metadata_migration')
 
-describe SchedulePagesMetadataMigration, :migration do
+describe SchedulePagesMetadataMigration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
 
diff --git a/spec/migrations/schedule_populate_merge_request_assignees_table_spec.rb b/spec/migrations/schedule_populate_merge_request_assignees_table_spec.rb
index 44ef72baa86..d778b47179f 100644
--- a/spec/migrations/schedule_populate_merge_request_assignees_table_spec.rb
+++ b/spec/migrations/schedule_populate_merge_request_assignees_table_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190322132835_schedule_populate_merge_request_assignees_table.rb')
 
-describe SchedulePopulateMergeRequestAssigneesTable, :migration do
+describe SchedulePopulateMergeRequestAssigneesTable do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab-org') }
diff --git a/spec/migrations/schedule_recalculate_project_authorizations_second_run_spec.rb b/spec/migrations/schedule_recalculate_project_authorizations_second_run_spec.rb
index 04726f98c89..4c05f7d57a1 100644
--- a/spec/migrations/schedule_recalculate_project_authorizations_second_run_spec.rb
+++ b/spec/migrations/schedule_recalculate_project_authorizations_second_run_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200204113224_schedule_recalculate_project_authorizations_second_run.rb')
 
-describe ScheduleRecalculateProjectAuthorizationsSecondRun, :migration do
+describe ScheduleRecalculateProjectAuthorizationsSecondRun do
   let(:users_table) { table(:users) }
 
   before do
diff --git a/spec/migrations/schedule_recalculate_project_authorizations_spec.rb b/spec/migrations/schedule_recalculate_project_authorizations_spec.rb
index 77ad2b2dc8e..d30ebf825ef 100644
--- a/spec/migrations/schedule_recalculate_project_authorizations_spec.rb
+++ b/spec/migrations/schedule_recalculate_project_authorizations_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200204113223_schedule_recalculate_project_authorizations.rb')
 
-describe ScheduleRecalculateProjectAuthorizations, :migration do
+describe ScheduleRecalculateProjectAuthorizations do
   let(:users_table) { table(:users) }
   let(:namespaces_table) { table(:namespaces) }
   let(:projects_table) { table(:projects) }
diff --git a/spec/migrations/schedule_runners_token_encryption_spec.rb b/spec/migrations/schedule_runners_token_encryption_spec.rb
index 60abb98f629..4121a8409b4 100644
--- a/spec/migrations/schedule_runners_token_encryption_spec.rb
+++ b/spec/migrations/schedule_runners_token_encryption_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20181121111200_schedule_runners_token_encryption')
 
-describe ScheduleRunnersTokenEncryption, :migration do
+describe ScheduleRunnersTokenEncryption do
   let(:settings) { table(:application_settings) }
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
diff --git a/spec/migrations/schedule_set_confidential_note_events_on_webhooks_spec.rb b/spec/migrations/schedule_set_confidential_note_events_on_webhooks_spec.rb
index c022610be08..ea1e16a0a35 100644
--- a/spec/migrations/schedule_set_confidential_note_events_on_webhooks_spec.rb
+++ b/spec/migrations/schedule_set_confidential_note_events_on_webhooks_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180104131052_schedule_set_confidential_note_events_on_webhooks.rb')
 
-describe ScheduleSetConfidentialNoteEventsOnWebhooks, :migration do
+describe ScheduleSetConfidentialNoteEventsOnWebhooks do
   let(:web_hooks_table) { table(:web_hooks) }
   let(:migration_class) { Gitlab::BackgroundMigration::SetConfidentialNoteEventsOnWebhooks }
   let(:migration_name)  { migration_class.to_s.demodulize }
diff --git a/spec/migrations/schedule_stages_index_migration_spec.rb b/spec/migrations/schedule_stages_index_migration_spec.rb
index f2e9abe1eb8..5ca857087e7 100644
--- a/spec/migrations/schedule_stages_index_migration_spec.rb
+++ b/spec/migrations/schedule_stages_index_migration_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180420080616_schedule_stages_index_migration')
 
-describe ScheduleStagesIndexMigration, :migration do
+describe ScheduleStagesIndexMigration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:pipelines) { table(:ci_pipelines) }
diff --git a/spec/migrations/schedule_sync_issuables_state_id_spec.rb b/spec/migrations/schedule_sync_issuables_state_id_spec.rb
index 21844edeb40..408e7e6d19d 100644
--- a/spec/migrations/schedule_sync_issuables_state_id_spec.rb
+++ b/spec/migrations/schedule_sync_issuables_state_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190214112022_schedule_sync_issuables_state_id.rb')
 
-describe ScheduleSyncIssuablesStateId, :migration do
+describe ScheduleSyncIssuablesStateId do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:merge_requests) { table(:merge_requests) }
diff --git a/spec/migrations/schedule_sync_issuables_state_id_where_nil_spec.rb b/spec/migrations/schedule_sync_issuables_state_id_where_nil_spec.rb
index 5dbe0d973ae..e26a864b8ba 100644
--- a/spec/migrations/schedule_sync_issuables_state_id_where_nil_spec.rb
+++ b/spec/migrations/schedule_sync_issuables_state_id_where_nil_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190506135400_schedule_sync_issuables_state_id_where_nil')
 
-describe ScheduleSyncIssuablesStateIdWhereNil, :migration do
+describe ScheduleSyncIssuablesStateIdWhereNil do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:merge_requests) { table(:merge_requests) }
diff --git a/spec/migrations/schedule_to_archive_legacy_traces_spec.rb b/spec/migrations/schedule_to_archive_legacy_traces_spec.rb
index a81fb1494c7..e9158df01c4 100644
--- a/spec/migrations/schedule_to_archive_legacy_traces_spec.rb
+++ b/spec/migrations/schedule_to_archive_legacy_traces_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180529152628_schedule_to_archive_legacy_traces')
 
-describe ScheduleToArchiveLegacyTraces, :migration do
+describe ScheduleToArchiveLegacyTraces do
   include TraceHelpers
 
   let(:namespaces) { table(:namespaces) }
diff --git a/spec/migrations/schedule_update_existing_subgroup_to_match_visibility_level_of_parent_spec.rb b/spec/migrations/schedule_update_existing_subgroup_to_match_visibility_level_of_parent_spec.rb
index 221f266cb70..098fe68927c 100644
--- a/spec/migrations/schedule_update_existing_subgroup_to_match_visibility_level_of_parent_spec.rb
+++ b/spec/migrations/schedule_update_existing_subgroup_to_match_visibility_level_of_parent_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200110121314_schedule_update_existing_subgroup_to_match_visibility_level_of_parent.rb')
 
-describe ScheduleUpdateExistingSubgroupToMatchVisibilityLevelOfParent, :migration do
+describe ScheduleUpdateExistingSubgroupToMatchVisibilityLevelOfParent do
   include MigrationHelpers::NamespacesHelpers
   let(:migration_class) { described_class::MIGRATION }
   let(:migration_name)  { migration_class.to_s.demodulize }
diff --git a/spec/migrations/services_remove_temporary_index_on_project_id_spec.rb b/spec/migrations/services_remove_temporary_index_on_project_id_spec.rb
index f730d7aecfd..d4f9969b71b 100644
--- a/spec/migrations/services_remove_temporary_index_on_project_id_spec.rb
+++ b/spec/migrations/services_remove_temporary_index_on_project_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200203104214_services_remove_temporary_index_on_project_id.rb')
 
-describe ServicesRemoveTemporaryIndexOnProjectId, :migration do
+describe ServicesRemoveTemporaryIndexOnProjectId do
   let(:migration_instance) { described_class.new }
 
   it 'adds and removes temporary partial index in up and down methods' do
diff --git a/spec/migrations/set_issue_id_for_all_versions_spec.rb b/spec/migrations/set_issue_id_for_all_versions_spec.rb
index bfc2731181b..ff281947db8 100644
--- a/spec/migrations/set_issue_id_for_all_versions_spec.rb
+++ b/spec/migrations/set_issue_id_for_all_versions_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20190715043954_set_issue_id_for_all_versions.rb')
 
-describe SetIssueIdForAllVersions, :migration do
+describe SetIssueIdForAllVersions do
   let(:projects) { table(:projects) }
   let(:issues) { table(:issues) }
   let(:designs) { table(:design_management_designs) }
diff --git a/spec/migrations/steal_fill_store_upload_spec.rb b/spec/migrations/steal_fill_store_upload_spec.rb
index ed809baf2b5..b5e3de1864c 100644
--- a/spec/migrations/steal_fill_store_upload_spec.rb
+++ b/spec/migrations/steal_fill_store_upload_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20181105201455_steal_fill_store_upload.rb')
 
-describe StealFillStoreUpload, :migration do
+describe StealFillStoreUpload do
   let(:uploads) { table(:uploads) }
 
   describe '#up' do
diff --git a/spec/migrations/sync_issuables_state_id_spec.rb b/spec/migrations/sync_issuables_state_id_spec.rb
index 3138d2bec33..4bd30172cbe 100644
--- a/spec/migrations/sync_issuables_state_id_spec.rb
+++ b/spec/migrations/sync_issuables_state_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190911251732_sync_issuables_state_id')
 
-describe SyncIssuablesStateId, :migration do
+describe SyncIssuablesStateId do
   let(:migration) { described_class.new }
 
   describe '#up' do
diff --git a/spec/migrations/truncate_user_fullname_spec.rb b/spec/migrations/truncate_user_fullname_spec.rb
index 65b870de7b8..a5e6a0a4fce 100644
--- a/spec/migrations/truncate_user_fullname_spec.rb
+++ b/spec/migrations/truncate_user_fullname_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20190325080727_truncate_user_fullname.rb')
 
-describe TruncateUserFullname, :migration do
+describe TruncateUserFullname do
   let(:users) { table(:users) }
 
   let(:user_short) { create_user(name: 'abc', email: 'test_short@example.com') }
diff --git a/spec/migrations/update_application_setting_npm_package_requests_forwarding_default_spec.rb b/spec/migrations/update_application_setting_npm_package_requests_forwarding_default_spec.rb
index dfe14b40c6e..f9523e0e582 100644
--- a/spec/migrations/update_application_setting_npm_package_requests_forwarding_default_spec.rb
+++ b/spec/migrations/update_application_setting_npm_package_requests_forwarding_default_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20200221105436_update_application_setting_npm_package_requests_forwarding_default.rb')
 
-describe UpdateApplicationSettingNpmPackageRequestsForwardingDefault, :migration do
+describe UpdateApplicationSettingNpmPackageRequestsForwardingDefault do
   # Create test data - pipeline and CI/CD jobs.
   let(:application_settings) { table(:application_settings) }
 
diff --git a/spec/migrations/update_fingerprint_sha256_within_keys_spec.rb b/spec/migrations/update_fingerprint_sha256_within_keys_spec.rb
index 20a506ea976..d149ec230a7 100644
--- a/spec/migrations/update_fingerprint_sha256_within_keys_spec.rb
+++ b/spec/migrations/update_fingerprint_sha256_within_keys_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 require Rails.root.join('db', 'post_migrate', '20200106071113_update_fingerprint_sha256_within_keys.rb')
 
-describe UpdateFingerprintSha256WithinKeys, :migration do
+describe UpdateFingerprintSha256WithinKeys do
   let(:key_table) { table(:keys) }
 
   describe '#up' do
diff --git a/spec/migrations/update_minimum_password_length_spec.rb b/spec/migrations/update_minimum_password_length_spec.rb
index 0a763e5ce0f..ed9c85362f5 100644
--- a/spec/migrations/update_minimum_password_length_spec.rb
+++ b/spec/migrations/update_minimum_password_length_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20191205084057_update_minimum_password_length')
 
-describe UpdateMinimumPasswordLength, :migration do
+describe UpdateMinimumPasswordLength do
   let(:application_settings) { table(:application_settings) }
   let(:application_setting) do
     application_settings.create!(
diff --git a/spec/migrations/update_project_import_visibility_level_spec.rb b/spec/migrations/update_project_import_visibility_level_spec.rb
index 9ea9b956f67..f8439fc4204 100644
--- a/spec/migrations/update_project_import_visibility_level_spec.rb
+++ b/spec/migrations/update_project_import_visibility_level_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20181219130552_update_project_import_visibility_level.rb')
 
-describe UpdateProjectImportVisibilityLevel, :migration do
+describe UpdateProjectImportVisibilityLevel do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:project) { projects.find_by_name(name) }
diff --git a/spec/migrations/update_timestamp_softwarelicensespolicy_spec.rb b/spec/migrations/update_timestamp_softwarelicensespolicy_spec.rb
index 539da8ac92a..918c5fb567f 100644
--- a/spec/migrations/update_timestamp_softwarelicensespolicy_spec.rb
+++ b/spec/migrations/update_timestamp_softwarelicensespolicy_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 require Rails.root.join('db', 'migrate', '20200116175538_update_timestamp_softwarelicensespolicy.rb')
 
-describe UpdateTimestampSoftwarelicensespolicy, :migration do
+describe UpdateTimestampSoftwarelicensespolicy do
   let(:software_licenses_policy) { table(:software_license_policies) }
   let(:projects) { table(:projects) }
   let(:licenses) { table(:software_licenses) }