diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-07-23 16:34:31 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-07-23 16:34:31 +1100 |
| commit | 4691fd020807bfc0693e07a811d1c3f3e50b6390 (patch) | |
| tree | 236c7dc34301379dd487d8df55987458273a0c90 | |
| parent | ddd2a25679f1d875332f603f115e25577b05a5a2 (diff) | |
| download | gitlab-ce-blackst0ne-replace-sidekiq-inline-with-perform-enqueued-jobs.tar.gz | |
| -rw-r--r-- | db/fixtures/development/04_project.rb | 2 | ||||
| -rw-r--r-- | db/fixtures/development/06_teams.rb | 2 | ||||
| -rw-r--r-- | db/fixtures/development/17_cycle_analytics.rb | 2 | ||||
| -rw-r--r-- | db/fixtures/development/20_nested_groups.rb | 2 | ||||
| -rw-r--r-- | db/fixtures/development/22_labeled_issues_seed.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/db/fixtures/development/04_project.rb b/db/fixtures/development/04_project.rb index 7d24aa9b199..51e69879c79 100644 --- a/db/fixtures/development/04_project.rb +++ b/db/fixtures/development/04_project.rb @@ -1,6 +1,6 @@ require './spec/support/sidekiq' -perform_enqueued_jobs do +Sidekiq::Testing.inline! do Gitlab::Seeder.quiet do project_urls = [ 'https://gitlab.com/gitlab-org/gitlab-test.git', diff --git a/db/fixtures/development/06_teams.rb b/db/fixtures/development/06_teams.rb index a01f54507cf..b218f4e71fd 100644 --- a/db/fixtures/development/06_teams.rb +++ b/db/fixtures/development/06_teams.rb @@ -1,6 +1,6 @@ require './spec/support/sidekiq' -perform_enqueued_jobs do +Sidekiq::Testing.inline! do Gitlab::Seeder.quiet do Group.all.each do |group| User.all.sample(4).each do |user| diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb index 295bfc415e7..7b9a4bad449 100644 --- a/db/fixtures/development/17_cycle_analytics.rb +++ b/db/fixtures/development/17_cycle_analytics.rb @@ -78,7 +78,7 @@ class Gitlab::Seeder::CycleAnalytics def seed! Sidekiq::Worker.skipping_transaction_check do - perform_enqueued_jobs do + Sidekiq::Testing.inline! do issues = create_issues puts '.' diff --git a/db/fixtures/development/20_nested_groups.rb b/db/fixtures/development/20_nested_groups.rb index da8f03bd8fe..3d95e243f8a 100644 --- a/db/fixtures/development/20_nested_groups.rb +++ b/db/fixtures/development/20_nested_groups.rb @@ -1,6 +1,6 @@ require './spec/support/sidekiq' -perform_enqueued_jobs do +Sidekiq::Testing.inline! do Gitlab::Seeder.quiet do flag = 'SEED_NESTED_GROUPS' diff --git a/db/fixtures/development/22_labeled_issues_seed.rb b/db/fixtures/development/22_labeled_issues_seed.rb index 9d1c3f15c39..3730e9c7958 100644 --- a/db/fixtures/development/22_labeled_issues_seed.rb +++ b/db/fixtures/development/22_labeled_issues_seed.rb @@ -11,7 +11,7 @@ class Gitlab::Seeder::LabeledIssues end def seed! - perform_enqueued_jobs do + Sidekiq::Testing.inline! do group = create_group create_projects(group) |