diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /db/fixtures | |
parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'db/fixtures')
-rw-r--r-- | db/fixtures/development/06_teams.rb | 2 | ||||
-rw-r--r-- | db/fixtures/development/33_triage_ops.rb | 48 |
2 files changed, 26 insertions, 24 deletions
diff --git a/db/fixtures/development/06_teams.rb b/db/fixtures/development/06_teams.rb index 7aaaa48d6d4..71fe0df70f4 100644 --- a/db/fixtures/development/06_teams.rb +++ b/db/fixtures/development/06_teams.rb @@ -4,7 +4,7 @@ Sidekiq::Testing.inline! do Gitlab::Seeder.quiet do Group.not_mass_generated.each do |group| User.not_mass_generated.sample(4).each do |user| - if group.add_user(user, Gitlab::Access.values.sample).persisted? + if group.add_member(user, Gitlab::Access.values.sample).persisted? print '.' else print 'F' diff --git a/db/fixtures/development/33_triage_ops.rb b/db/fixtures/development/33_triage_ops.rb index aaf92315125..b2dd3861169 100644 --- a/db/fixtures/development/33_triage_ops.rb +++ b/db/fixtures/development/33_triage_ops.rb @@ -11,29 +11,31 @@ class Gitlab::Seeder::TriageOps puts "Updating settings to allow web hooks to localhost" ApplicationSetting.current_without_cache.update!(allow_local_requests_from_web_hooks_and_services: true) - Sidekiq::Testing.inline! do - puts "Ensuring required groups" - ensure_group('gitlab-com') - ensure_group('gitlab-com/gl-security/appsec') - ensure_group('gitlab-jh/jh-team') - ensure_group('gitlab-org') - ensure_group('gitlab-org/gitlab-core-team/community-members') - ensure_group('gitlab-org/security') - - puts "Ensuring required projects" - ensure_project('gitlab-org/gitlab') - ensure_project('gitlab-org/security/gitlab') - - puts "Ensuring required bot user" - ensure_bot_user - - puts "Setting up webhooks" - ensure_webhook_for('gitlab-com') - ensure_webhook_for('gitlab-org') - - puts "Ensuring work type labels" - ensure_work_type_labels_for('gitlab-com') - ensure_work_type_labels_for('gitlab-org') + Sidekiq::Worker.skipping_transaction_check do + Sidekiq::Testing.inline! do + puts "Ensuring required groups" + ensure_group('gitlab-com') + ensure_group('gitlab-com/gl-security/appsec') + ensure_group('gitlab-jh/jh-team') + ensure_group('gitlab-org') + ensure_group('gitlab-org/gitlab-core-team/community-members') + ensure_group('gitlab-org/security') + + puts "Ensuring required projects" + ensure_project('gitlab-org/gitlab') + ensure_project('gitlab-org/security/gitlab') + + puts "Ensuring required bot user" + ensure_bot_user + + puts "Setting up webhooks" + ensure_webhook_for('gitlab-com') + ensure_webhook_for('gitlab-org') + + puts "Ensuring work type labels" + ensure_work_type_labels_for('gitlab-com') + ensure_work_type_labels_for('gitlab-org') + end end end |