diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-07 22:08:56 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-04-07 22:08:56 +0000 |
| commit | 68a839c24c97370a25c5c233fef974e29a4ed480 (patch) | |
| tree | 649a198335ba54512f591b163975476a7f8f508e /spec/factories | |
| parent | 7759049b1fb664dedaf726f9ac1d14a1f4527ce6 (diff) | |
| parent | ace833b31dfac64a8b44242ce7d91c60285bf983 (diff) | |
| download | gitlab-ce-68a839c24c97370a25c5c233fef974e29a4ed480.tar.gz | |
Merge branch 'adam-finish-5993-closed-issuable' into 'master'
Add indication for closed or merged issuables in GFM
Closes #1369
See merge request !9462
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/merge_requests.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index e36fe326e1c..361f9dac191 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -44,6 +44,10 @@ FactoryGirl.define do state :reopened end + trait :locked do + state :locked + end + trait :simple do source_branch "feature" target_branch "master" |