diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-14 15:12:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-14 15:12:34 +0300 |
commit | 16daf112d6cfe2c87d8837382a00d88aa8c0ff5c (patch) | |
tree | 017d43acafea2928550fe7c8fdbb7cf36335ba9f /db/fixtures | |
parent | 3cb798d80b6b5235b5f5febaaacef410e75c2963 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db/fixtures')
-rw-r--r-- | db/fixtures/development/17_cycle_analytics.rb | 2 | ||||
-rw-r--r-- | db/fixtures/development/24_forks.rb | 2 | ||||
-rw-r--r-- | db/fixtures/development/98_gitlab_instance_administration_project.rb | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb index fa19775a571..8e9952e9ba1 100644 --- a/db/fixtures/development/17_cycle_analytics.rb +++ b/db/fixtures/development/17_cycle_analytics.rb @@ -154,6 +154,8 @@ class Gitlab::Seeder::CycleAnalytics @developers << user end + + AuthorizedProjectUpdate::ProjectRecalculateService.new(project).execute end def create_new_vsm_project diff --git a/db/fixtures/development/24_forks.rb b/db/fixtures/development/24_forks.rb index 536d9f9e2ba..a3db84ab1b7 100644 --- a/db/fixtures/development/24_forks.rb +++ b/db/fixtures/development/24_forks.rb @@ -24,6 +24,8 @@ Sidekiq::Testing.inline! do # the `after_commit` queue to ensure the job is run now. fork_project.send(:_run_after_commit_queue) fork_project.import_state.send(:_run_after_commit_queue) + # We should also force-run the project authorizations refresh job for the created project. + AuthorizedProjectUpdate::ProjectRecalculateService.new(fork_project).execute # Expire repository cache after import to ensure # valid_repo? call below returns a correct answer diff --git a/db/fixtures/development/98_gitlab_instance_administration_project.rb b/db/fixtures/development/98_gitlab_instance_administration_project.rb index 9f50ce6a7e4..3338f2bd2fc 100644 --- a/db/fixtures/development/98_gitlab_instance_administration_project.rb +++ b/db/fixtures/development/98_gitlab_instance_administration_project.rb @@ -1,7 +1,10 @@ # frozen_string_literal: true response = Sidekiq::Worker.skipping_transaction_check do - ::Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService.new.execute + result = ::Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService.new.execute + AuthorizedProjectUpdate::ProjectRecalculateService.new(result[:project]).execute + + result end if response[:status] == :success |