diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-09 15:09:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-09 15:09:48 +0300 |
| commit | 3c53fbc50bf8d084f1184836468850d2a83ef920 (patch) | |
| tree | 85c451a4082e7b5e8dc3ecb6265edb1aef0b14f0 /spec/factories/merge_requests.rb | |
| parent | e7462f7b49a60b2ee7be14682c23190f7f7c5ba7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/factories/merge_requests.rb')
| -rw-r--r-- | spec/factories/merge_requests.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index dba98593a03..ecdb1c95866 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -21,9 +21,6 @@ FactoryBot.define do merge_status { "can_be_merged" } - trait :with_diffs do - end - trait :jira_title do title { generate(:jira_title) } end @@ -306,7 +303,7 @@ FactoryBot.define do factory :closed_merge_request, traits: [:closed] factory :reopened_merge_request, traits: [:opened] factory :invalid_merge_request, traits: [:invalid] - factory :merge_request_with_diffs, traits: [:with_diffs] + factory :merge_request_with_diffs factory :merge_request_with_diff_notes do after(:create) do |mr| create(:diff_note_on_merge_request, noteable: mr, project: mr.source_project) |