diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-24 15:36:20 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-24 15:36:20 +0000 |
| commit | 068768e1f8b64f7de4fe18b094e7f2e7555c9398 (patch) | |
| tree | 9eb44dbf080c052598e4696c03141c900db728f8 | |
| parent | abae261b86d8a1eedb50e85083cad1a07154c4d3 (diff) | |
| parent | dffe984d94df4280f5b98a4a1f06248bd39f16c3 (diff) | |
| download | gitlab-ce-068768e1f8b64f7de4fe18b094e7f2e7555c9398.tar.gz | |
Merge branch 'osw-49554-broken-master' into 'master'
Add :sidekiq group to cleanup redis in after callback
See merge request gitlab-org/gitlab-ce!20816
| -rw-r--r-- | spec/lib/gitlab/background_migration/delete_diff_files_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/background_migration/schedule_diff_files_deletion_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/background_migration/delete_diff_files_spec.rb b/spec/lib/gitlab/background_migration/delete_diff_files_spec.rb index 64c994a268f..1969aed51da 100644 --- a/spec/lib/gitlab/background_migration/delete_diff_files_spec.rb +++ b/spec/lib/gitlab/background_migration/delete_diff_files_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Gitlab::BackgroundMigration::DeleteDiffFiles, :migration, schema: 20180619121030 do +describe Gitlab::BackgroundMigration::DeleteDiffFiles, :migration, :sidekiq, schema: 20180619121030 do describe '#perform' do context 'when diff files can be deleted' do let(:merge_request) { create(:merge_request, :merged) } diff --git a/spec/lib/gitlab/background_migration/schedule_diff_files_deletion_spec.rb b/spec/lib/gitlab/background_migration/schedule_diff_files_deletion_spec.rb index fb5093b0bd1..ec8ba0ce127 100644 --- a/spec/lib/gitlab/background_migration/schedule_diff_files_deletion_spec.rb +++ b/spec/lib/gitlab/background_migration/schedule_diff_files_deletion_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Gitlab::BackgroundMigration::ScheduleDiffFilesDeletion, :migration, schema: 20180619121030 do +describe Gitlab::BackgroundMigration::ScheduleDiffFilesDeletion, :migration, :sidekiq, schema: 20180619121030 do describe '#perform' do let(:merge_request_diffs) { table(:merge_request_diffs) } let(:merge_requests) { table(:merge_requests) } |