diff options
author | Tanya Pazitny <tpazitny@gitlab.com> | 2019-03-04 14:33:18 -0800 |
---|---|---|
committer | Tanya Pazitny <tpazitny@gitlab.com> | 2019-03-04 14:33:18 -0800 |
commit | c4c6d517ba0cb8f0ebb6d3814a8a4fd43eee89d3 (patch) | |
tree | b66ace179b1032ee2ab463d2cee7b1855d032bc7 | |
parent | 7b4130d0f7390629d683e4365279ab5554bbcfc4 (diff) | |
download | gitlab-ce-tp-fix-rescue-block.tar.gz |
Update rescue block in merge requests fixture filetp-fix-rescue-block58507-ce-gdk-installation-fails-due-to-merge-requests-seed-file
-rw-r--r-- | db/fixtures/development/10_merge_requests.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb index 2051bcff8f0..0d8dda97068 100644 --- a/db/fixtures/development/10_merge_requests.rb +++ b/db/fixtures/development/10_merge_requests.rb @@ -25,12 +25,15 @@ Gitlab::Seeder.quiet do developer = project.team.developers.sample break unless developer - Sidekiq::Worker.skipping_transaction_check do - MergeRequests::CreateService.new(project, developer, params).execute + begin + Sidekiq::Worker.skipping_transaction_check do + MergeRequests::CreateService.new(project, developer, params).execute + end rescue Repository::AmbiguousRefError # Ignore pipelines creation errors for now, we can doing that after # https://gitlab.com/gitlab-org/gitlab-ce/issues/55966. will be resolved. end + print '.' end end |