diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-12 00:09:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-12 00:09:48 +0300 |
| commit | c77ce73fa85c128dfeb90a45c4eb306b8c1fe0c9 (patch) | |
| tree | 095d7aea5d0817382f947f9d2c04e45fcfad47c9 /db | |
| parent | 11c2b8eff6ca5360fb0f732b23b764d2a0b81be5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/fixtures/development/20_nested_groups.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/db/fixtures/development/20_nested_groups.rb b/db/fixtures/development/20_nested_groups.rb index 8f64dfbd644..d9aea17aa16 100644 --- a/db/fixtures/development/20_nested_groups.rb +++ b/db/fixtures/development/20_nested_groups.rb @@ -23,8 +23,9 @@ Sidekiq::Testing.inline! do full_path = url.sub('https://android.googlesource.com/', '') full_path = full_path.sub(/\.git\z/, '') full_path, _, project_path = full_path.rpartition('/') - group = Group.find_by_full_path(full_path) || - Groups::NestedCreateService.new(user, group_path: full_path).execute + group = Sidekiq::Worker.skipping_transaction_check do + Group.find_by_full_path(full_path) || Groups::NestedCreateService.new(user, group_path: full_path).execute + end params = { import_url: url, |