diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-09-07 19:03:20 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-09-07 19:03:20 +0300 |
| commit | 12ddc28f844fe63446a16ac908b09ed7b13c71ef (patch) | |
| tree | 149ef1a7e2b32e6fa8c4462394daf942b7452440 /spec/factories | |
| parent | 62a5cc7134457d21bf3a68bfdb04e090cf0e6ecf (diff) | |
| parent | f2421b2b97d81ef7631f1baefb4ba4401c8a04dc (diff) | |
Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops-table
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/milestones.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/factories/milestones.rb b/spec/factories/milestones.rb index 2f75bf12cd7..b5298b2f969 100644 --- a/spec/factories/milestones.rb +++ b/spec/factories/milestones.rb @@ -7,6 +7,7 @@ FactoryGirl.define do group nil project_id nil group_id nil + parent nil end trait :active do @@ -26,6 +27,9 @@ FactoryGirl.define do milestone.project = evaluator.project elsif evaluator.project_id milestone.project_id = evaluator.project_id + elsif evaluator.parent + id = evaluator.parent.id + evaluator.parent.is_a?(Group) ? board.group_id = id : evaluator.project_id = id else milestone.project = create(:project) end |