diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-06 03:38:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-06 03:38:05 +0000 |
| commit | ff6a5fb31bceda44abd8a2c6ebea0bcecdc5c96e (patch) | |
| tree | 641b15f1e3fe62dd679388464d5b8157f800339a | |
| parent | 411bf8ca08fd32b3b44ed9c518623a78c8ab5404 (diff) | |
| parent | 58ecb06f74f9aa6af46f7110cb5753e1f30790cd (diff) | |
| download | gitlab-ce-ff6a5fb31bceda44abd8a2c6ebea0bcecdc5c96e.tar.gz | |
Merge branch 'remove-group-milestone-participants-duplicates' into 'master'
Remove duplicates from group milestone participants list.
See merge request !1473
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/models/group_milestone.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8d01bc4d890..eb78d2b59e4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -51,7 +51,7 @@ v 7.8.0 - - Add action property to merge request hook (Julien Bianchi) - - - + - Remove duplicates from group milestone participants list. - - - Add a new API function that retrieves all issues assigned to a single milestone (Justin Whear and Hannes Rosenögger) diff --git a/app/models/group_milestone.rb b/app/models/group_milestone.rb index 33915313789..7e4f16ebf16 100644 --- a/app/models/group_milestone.rb +++ b/app/models/group_milestone.rb @@ -66,15 +66,15 @@ class GroupMilestone end def issues - @group_issues ||= milestones.map { |milestone| milestone.issues }.flatten.group_by(&:state) + @group_issues ||= milestones.map(&:issues).flatten.group_by(&:state) end def merge_requests - @group_merge_requests ||= milestones.map { |milestone| milestone.merge_requests }.flatten.group_by(&:state) + @group_merge_requests ||= milestones.map(&:merge_requests).flatten.group_by(&:state) end def participants - milestones.map { |milestone| milestone.participants.uniq }.reject(&:empty?).flatten + @group_participants ||= milestones.map(&:participants).flatten.compact.uniq end def opened_issues |