[WIP] CE 8-5-stable to EE 8-5-stable-ee
Unresolved conflict:
- app/views/projects/milestones/show.html.haml
The problem is that the milestone/show view has changed in CE:
but in EE there was mention of the "total issues weight" in the "Issues" tab:
I don't know how to resolve this conflict since it requires a UI change... I think we could add (total weight: XX)
before the YY% complete
part.
Note: I don't think we'll actually merge this MR, I just need to know how to resolve this conflict.
Merge request reports
Activity
@rspeicher Right, here is the part of code that has been modified (the EE-specific code is separated with blank lines above and below):
%span.milestone-stat %strong= @milestone.open_items_count open and %strong= @milestone.closed_items_count closed - total_weight = @milestone.issues.sum(:weight) - unless total_weight.zero? = surround '(', ')' do total weight: %strong= total_weight %span.milestone-stat %strong== #{@milestone.percent_complete}% complete
Please register or sign in to reply