diff options
-rw-r--r-- | app/assets/stylesheets/sections/groups.scss | 5 | ||||
-rw-r--r-- | app/models/group_milestone.rb | 20 | ||||
-rw-r--r-- | app/services/milestones/group_service.rb | 2 | ||||
-rw-r--r-- | app/views/groups/milestones/_issue.html.haml | 3 | ||||
-rw-r--r-- | app/views/groups/milestones/_merge_request.html.haml | 3 |
5 files changed, 13 insertions, 20 deletions
diff --git a/app/assets/stylesheets/sections/groups.scss b/app/assets/stylesheets/sections/groups.scss index e174f72882b..e49fe1a9dd6 100644 --- a/app/assets/stylesheets/sections/groups.scss +++ b/app/assets/stylesheets/sections/groups.scss @@ -11,8 +11,3 @@ .milestone-row { @include str-truncated(90%); } - -.label.label-default.project-name { - width: 80px; - @include str-truncated(80%); -} diff --git a/app/models/group_milestone.rb b/app/models/group_milestone.rb index cbd9f2a33cb..7af61f97a63 100644 --- a/app/models/group_milestone.rb +++ b/app/models/group_milestone.rb @@ -18,27 +18,27 @@ class GroupMilestone end def projects - milestones.map{ |milestone| milestone.project } + milestones.map { |milestone| milestone.project } end def issue_count - milestones.map{ |milestone| milestone.issues.count }.sum + milestones.map { |milestone| milestone.issues.count }.sum end def merge_requests_count - milestones.map{ |milestone| milestone.merge_requests.count }.sum + milestones.map { |milestone| milestone.merge_requests.count }.sum end def open_items_count - milestones.map{ |milestone| milestone.open_items_count }.sum + milestones.map { |milestone| milestone.open_items_count }.sum end def closed_items_count - milestones.map{ |milestone| milestone.closed_items_count }.sum + milestones.map { |milestone| milestone.closed_items_count }.sum end def total_items_count - milestones.map{ |milestone| milestone.total_items_count }.sum + milestones.map { |milestone| milestone.total_items_count }.sum end def percent_complete @@ -48,7 +48,7 @@ class GroupMilestone end def state - state = milestones.map{ |milestone| milestone.state } + state = milestones.map { |milestone| milestone.state } if state.count('active') == state.size 'active' @@ -66,15 +66,15 @@ class GroupMilestone end def issues - @group_issues ||= milestones.map{ |milestone| milestone.issues }.flatten.group_by(&:state) + @group_issues ||= milestones.map { |milestone| milestone.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 { |milestone| milestone.merge_requests }.flatten.group_by(&:state) end def participants - milestones.map{ |milestone| milestone.participants.uniq }.reject(&:empty?).flatten + milestones.map { |milestone| milestone.participants.uniq }.reject(&:empty?).flatten end def opened_issues diff --git a/app/services/milestones/group_service.rb b/app/services/milestones/group_service.rb index 2d1aa878c24..11d702f1e7b 100644 --- a/app/services/milestones/group_service.rb +++ b/app/services/milestones/group_service.rb @@ -17,7 +17,7 @@ module Milestones end end - private + private def build(milestone) milestone.map{ |title, milestones| GroupMilestone.new(title, milestones) } diff --git a/app/views/groups/milestones/_issue.html.haml b/app/views/groups/milestones/_issue.html.haml index 759003bb56c..c0cf56941f5 100644 --- a/app/views/groups/milestones/_issue.html.haml +++ b/app/views/groups/milestones/_issue.html.haml @@ -1,8 +1,7 @@ %li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid } %span.milestone-row - project = issue.project - %span.label.label-default.project-name - = project.name + %strong #{project.name} · = link_to [project, issue] do %span.cgray ##{issue.iid} = link_to_gfm issue.title, [project, issue] diff --git a/app/views/groups/milestones/_merge_request.html.haml b/app/views/groups/milestones/_merge_request.html.haml index 95d5de002df..037162a20e0 100644 --- a/app/views/groups/milestones/_merge_request.html.haml +++ b/app/views/groups/milestones/_merge_request.html.haml @@ -1,8 +1,7 @@ %li{ id: dom_id(merge_request, 'sortable'), class: 'mr-row', 'data-iid' => merge_request.iid } %span.milestone-row - project = merge_request.project - %span.label.label-default.project-name - = project.name + %strong #{project.name} · = link_to [project, merge_request] do %span.cgray ##{merge_request.iid} = link_to_gfm merge_request.title, [project, merge_request] |