diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 03:08:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 03:08:07 +0300 |
| commit | 21539fe9ab9a7a9604bb667b78b08854b4976f7b (patch) | |
| tree | 82fb2be49aaaace5057d1e8e208ad12a422a7bbb /spec/factories/merge_requests.rb | |
| parent | e7bc93852d0ce48c490a780b6a1adc6cc36dd342 (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, 5 insertions, 0 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index b10c04a37f7..be4c79621ff 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -133,6 +133,11 @@ FactoryBot.define do end end + trait :unique_branches do + source_branch { generate(:branch) } + target_branch { generate(:branch) } + end + trait :with_coverage_reports do after(:build) do |merge_request| merge_request.head_pipeline = build( |