diff options
| author | Pierre de La Morinerie <pierre@capitainetrain.com> | 2016-02-04 19:23:58 +0100 |
|---|---|---|
| committer | Pierre de La Morinerie <pierre@capitainetrain.com> | 2016-03-03 15:11:44 +0100 |
| commit | 543845f7efe0b70926ea699eaf1e413fa878b285 (patch) | |
| tree | f37858135e9ce5ac7c5bd7e4aad685582c363686 /spec/factories | |
| parent | 566ea8543d971c4b811b2939b0677c5db52feab3 (diff) | |
| download | gitlab-ce-543845f7efe0b70926ea699eaf1e413fa878b285.tar.gz | |
Indicate how much an MR branch diverges from the target branch
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/merge_requests.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index 00de7bb5294..ca1c636fce4 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -69,6 +69,16 @@ FactoryGirl.define do target_branch "master" end + trait :rebased do + source_branch "markdown" + target_branch "improve/awesome" + end + + trait :diverged do + source_branch "feature" + target_branch "master" + end + trait :merge_when_build_succeeds do merge_when_build_succeeds true merge_user author |