Add latest changes from gitlab-org/gitlab@master

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) }

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) }

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) }

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 }

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 }

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, '*') }

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) }

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',

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) }

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) }

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) }

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) }

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) }

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

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) }

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) }

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

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) }

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) }

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) }