diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 00:09:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 00:09:02 +0300 |
| commit | 76623c12c136f43f24c3966ed4b469e2c0b434b7 (patch) | |
| tree | 7c5ec884c25e03e4fea131a4d112a9d0ccfd59b8 /spec/services/merge_requests | |
| parent | b042382bbf5a4977c5b5c6b0a9a33f4e8ca8d16d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/merge_requests')
| -rw-r--r-- | spec/services/merge_requests/migrate_external_diffs_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/migrate_external_diffs_service_spec.rb b/spec/services/merge_requests/migrate_external_diffs_service_spec.rb index 40ac747e66f..233b944624f 100644 --- a/spec/services/merge_requests/migrate_external_diffs_service_spec.rb +++ b/spec/services/merge_requests/migrate_external_diffs_service_spec.rb @@ -6,7 +6,7 @@ describe MergeRequests::MigrateExternalDiffsService do let(:merge_request) { create(:merge_request) } let(:diff) { merge_request.merge_request_diff } - describe '.enqueue!', :sidekiq do + describe '.enqueue!' do around do |example| Sidekiq::Testing.fake! { example.run } end |