Skip to content
Snippets Groups Projects

[WIP] CE 8-5-stable to EE 8-5-stable-ee

Closed username-removed-128633 requested to merge ce-8-5-stable-to-ee-8-5-stable-ee into 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: Screen_Shot_2016-02-19_at_21.28.36

but in EE there was mention of the "total issues weight" in the "Issues" tab: Screen_Shot_2016-02-19_at_21.28.00

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

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Here's what it looks locally with my suggestion: Screen_Shot_2016-02-19_at_21.50.44

  • @rymai LGTM. We'll need to make sure the same change happens during the master CE-to-EE merge for consistency. cc @vsizov

  • @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
  • username-removed-128633 Status changed to closed

    Status changed to closed

Please register or sign in to reply
Loading