diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/factories/resource_state_event.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/factories/resource_state_event.rb')
-rw-r--r-- | spec/factories/resource_state_event.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/factories/resource_state_event.rb b/spec/factories/resource_state_event.rb index e3de462b797..926c6dd8cbc 100644 --- a/spec/factories/resource_state_event.rb +++ b/spec/factories/resource_state_event.rb @@ -2,9 +2,9 @@ FactoryBot.define do factory :resource_state_event do - issue { merge_request.nil? ? create(:issue) : nil } + issue { merge_request.nil? ? association(:issue) : nil } merge_request { nil } state { :opened } - user { issue&.author || merge_request&.author || create(:user) } + user { issue&.author || merge_request&.author || association(:user) } end end |