Commit 6f314246 authored by Alfredo Sumaran's avatar Alfredo Sumaran

Fix conflicts on _summary.html.haml partial

parent b168bf64
...@@ -4,24 +4,6 @@ ...@@ -4,24 +4,6 @@
.milestone-summary .milestone-summary
%h4 Progress %h4 Progress
<<<<<<< HEAD
- remaining_days = milestone_remaining_days(milestone)
- if remaining_days
%span.milestone-stat
%span.remaining-days= remaining_days
- total_weight = milestone.issues_visible_to_user(current_user).sum(:weight)
- unless total_weight.zero?
%span.milestone-stat
Total weight:
%strong= total_weight
%span.pull-right.tab-issues-buttons
- if project && can?(current_user, :create_issue, project)
= link_to new_namespace_project_issue_path(project.namespace, project, issue: { milestone_id: milestone.id }), class: "btn btn-grouped", title: "New Issue" do
New Issue
= link_to 'Browse Issues', milestones_browse_issuables_path(milestone, type: :issues), class: "btn btn-grouped"
%span.pull-right.tab-merge-requests-buttons.hidden
= link_to 'Browse Merge Requests', milestones_browse_issuables_path(milestone, type: :merge_requests), class: "btn btn-grouped"
=======
.milestone-stats-and-buttons .milestone-stats-and-buttons
.milestone-stats .milestone-stats
%span.milestone-stat.with-drilldown %span.milestone-stat.with-drilldown
...@@ -45,7 +27,6 @@ ...@@ -45,7 +27,6 @@
complete complete
%span.milestone-stat %span.milestone-stat
%span.remaining-days= milestone_remaining_days(milestone) %span.remaining-days= milestone_remaining_days(milestone)
>>>>>>> ce/master
.milestone-progress-buttons .milestone-progress-buttons
%span.tab-issues-buttons %span.tab-issues-buttons
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment