diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-15 21:10:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-15 21:10:06 +0300 |
commit | b07852468f800d751ddecc9e327119d7295f538e (patch) | |
tree | d1169f95ea3725d609c796a1ca87d5766646852c /spec/factories/projects.rb | |
parent | 0ff373dc416216d02760c7c162ee23382eb1f4a3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/factories/projects.rb')
-rw-r--r-- | spec/factories/projects.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index 413244acaa1..8666a4289e8 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -37,6 +37,8 @@ FactoryBot.define do # we can't assign the delegated `#ci_cd_settings` attributes directly, as the # `#ci_cd_settings` relation needs to be created first group_runners_enabled { nil } + merge_pipelines_enabled { nil } + merge_trains_enabled { nil } import_status { nil } import_jid { nil } import_correlation_id { nil } @@ -77,7 +79,9 @@ FactoryBot.define do project.group&.refresh_members_authorized_projects # assign the delegated `#ci_cd_settings` attributes after create - project.reload.group_runners_enabled = evaluator.group_runners_enabled unless evaluator.group_runners_enabled.nil? + project.group_runners_enabled = evaluator.group_runners_enabled unless evaluator.group_runners_enabled.nil? + project.merge_pipelines_enabled = evaluator.merge_pipelines_enabled unless evaluator.merge_pipelines_enabled.nil? + project.merge_trains_enabled = evaluator.merge_trains_enabled unless evaluator.merge_trains_enabled.nil? if evaluator.import_status import_state = project.import_state || project.build_import_state |