diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-15 15:17:08 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-15 15:17:08 +0000 |
| commit | 6f50cef8094d9b14d2bdff731f0eeb01c31516bf (patch) | |
| tree | b03f72adbb3c156bcf893b1218eabbcb7d6c7372 /spec/factories | |
| parent | a628db7b4d8c83a80d3151ba7a4c3d694b1a678c (diff) | |
| parent | e632bd26e4b70b100e5c9891b4b2cc7e267080c9 (diff) | |
| download | gitlab-ce-6f50cef8094d9b14d2bdff731f0eeb01c31516bf.tar.gz | |
Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master'
Fixes "iid of max iid" in Issuable sidebar for merged MR
Fixes #13928.
See merge request !3046
Diffstat (limited to 'spec/factories')
| -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 ca1c636fce4..a9df5fa1d3a 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -56,6 +56,10 @@ FactoryGirl.define do target_branch "feature" end + trait :merged do + state :merged + end + trait :closed do state :closed end @@ -84,6 +88,7 @@ FactoryGirl.define do merge_user author end + factory :merged_merge_request, traits: [:merged] factory :closed_merge_request, traits: [:closed] factory :reopened_merge_request, traits: [:reopened] factory :merge_request_with_diffs, traits: [:with_diffs] |