diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-06-30 10:54:57 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-06-30 11:13:24 +0200 |
| commit | e66a8b4cdab176ff89a685788dcbcac089712e49 (patch) | |
| tree | 58cd81b66bef2e0170e66bde18eadb028b0e973c /app/models/group_milestone.rb | |
| parent | c223fb1a9677ae00285426090618f5762de9f40e (diff) | |
| download | gitlab-ce-e66a8b4cdab176ff89a685788dcbcac089712e49.tar.gz | |
Move milestone link in group head, 2 column milestone for MR and issues.
Diffstat (limited to 'app/models/group_milestone.rb')
| -rw-r--r-- | app/models/group_milestone.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/app/models/group_milestone.rb b/app/models/group_milestone.rb index 0faff39ae7a..45222f5329e 100644 --- a/app/models/group_milestone.rb +++ b/app/models/group_milestone.rb @@ -65,16 +65,12 @@ class GroupMilestone state == 'closed' end - def opened_unassigned_issues - milestones.map{ |milestone| milestone.issues.opened.unassigned } + def issues + milestones.map{ |milestone| milestone.issues }.flatten.group_by(&:state) end - def opened_assigned_issues - milestones.map{ |milestone| milestone.issues.opened.assigned } - end - - def closed_issues - milestones.map{ |milestone| milestone.issues.closed } + def merge_requests + milestones.map{ |milestone| milestone.merge_requests }.flatten.group_by(&:state) end def participants |