diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-07 20:03:55 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-07 20:03:55 -0500 |
| commit | f058b52b50c76de9557b167a1a31a5c9ba446f31 (patch) | |
| tree | 047f04c2b0ed83ed71a6b39e64f55c40eded838b /spec/factories | |
| parent | 130a1e86e215d5d43cd3c53a44589aa5b8c69aab (diff) | |
| parent | 7d3f37b0b879af562dc7c499bdbfcb230ed718a4 (diff) | |
| download | gitlab-ce-f058b52b50c76de9557b167a1a31a5c9ba446f31.tar.gz | |
Merge branch 'master' into new-resolvable-discussion
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" |