Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 10 deletions

diff --git a/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb b/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
index 0453ac87436..a84cac0623b 100644
--- a/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
+++ b/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
@@ -14,28 +14,28 @@ describe MigrateIssueTrackersData, :migration do
     }
   end
   let!(:jira_service) do
-    services.create(id: 10, type: 'JiraService', properties: properties, category: 'issue_tracker')
+    services.create(type: 'JiraService', properties: properties, category: 'issue_tracker')
   end
   let!(:jira_service_nil) do
-    services.create(id: 11, type: 'JiraService', properties: nil, category: 'issue_tracker')
+    services.create(type: 'JiraService', properties: nil, category: 'issue_tracker')
   end
   let!(:bugzilla_service) do
-    services.create(id: 12, type: 'BugzillaService', properties: properties, category: 'issue_tracker')
+    services.create(type: 'BugzillaService', properties: properties, category: 'issue_tracker')
   end
   let!(:youtrack_service) do
-    services.create(id: 13, type: 'YoutrackService', properties: properties, category: 'issue_tracker')
+    services.create(type: 'YoutrackService', properties: properties, category: 'issue_tracker')
   end
   let!(:youtrack_service_empty) do
-    services.create(id: 14, type: 'YoutrackService', properties: '', category: 'issue_tracker')
+    services.create(type: 'YoutrackService', properties: '', category: 'issue_tracker')
   end
   let!(:gitlab_service) do
-    services.create(id: 15, type: 'GitlabIssueTrackerService', properties: properties, category: 'issue_tracker')
+    services.create(type: 'GitlabIssueTrackerService', properties: properties, category: 'issue_tracker')
   end
   let!(:gitlab_service_empty) do
-    services.create(id: 16, type: 'GitlabIssueTrackerService', properties: {}, category: 'issue_tracker')
+    services.create(type: 'GitlabIssueTrackerService', properties: {}, category: 'issue_tracker')
   end
   let!(:other_service) do
-    services.create(id: 17, type: 'OtherService', properties: properties, category: 'other_category')
+    services.create(type: 'OtherService', properties: properties, category: 'other_category')
   end
 
   before do
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 4f947358991..b51708dd5cd 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, :sidekiq do
+describe RescheduleMigrateIssueTrackersData, :migration do
   let(:services) { table(:services) }
   let(:migration_class) { Gitlab::BackgroundMigration::MigrateIssueTrackersSensitiveData }
   let(:migration_name)  { migration_class.to_s.demodulize }
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 5ff9ff4641f..221f266cb70 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, :sidekiq do
+describe ScheduleUpdateExistingSubgroupToMatchVisibilityLevelOfParent, :migration do
   include MigrationHelpers::NamespacesHelpers
   let(:migration_class) { described_class::MIGRATION }
   let(:migration_name)  { migration_class.to_s.demodulize }