Commit 5958a32b authored by Igor Drozdov's avatar Igor Drozdov

Merge branch 'sh-disable-transaction-check-user-sees-pipeline-spec' into 'master'

Disable transaction checks for threaded spec

See merge request gitlab-org/gitlab!50560
parents d5f071c1 72ec0eb4
...@@ -238,11 +238,15 @@ RSpec.describe 'Merge request > User sees pipelines', :js do ...@@ -238,11 +238,15 @@ RSpec.describe 'Merge request > User sees pipelines', :js do
threads = [] threads = []
threads << Thread.new do threads << Thread.new do
@merge_request = MergeRequests::CreateService.new(project, user, merge_request_params).execute Sidekiq::Worker.skipping_transaction_check do
@merge_request = MergeRequests::CreateService.new(project, user, merge_request_params).execute
end
end end
threads << Thread.new do threads << Thread.new do
@pipeline = Ci::CreatePipelineService.new(project, user, build_push_data).execute(:push) Sidekiq::Worker.skipping_transaction_check do
@pipeline = Ci::CreatePipelineService.new(project, user, build_push_data).execute(:push)
end
end end
threads.each { |thr| thr.join } threads.each { |thr| thr.join }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment