Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 51 deletions

diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 49d3039d0c9..5f244d3a6c3 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -3,57 +3,8 @@
 - page_title       @milestone.title, _('Milestones')
 - page_description @milestone.description
 
-.detail-page-header.milestone-page-header
-  .status-box{ class: status_box_class(@milestone) }
-    - if @milestone.closed?
-      = _('Closed')
-    - elsif @milestone.expired?
-      = _('Past due')
-    - elsif @milestone.upcoming?
-      = _('Upcoming')
-    - else
-      = _('Open')
-  .header-text-content
-    %span.identifier
-      %strong
-        = _('Milestone')
-    - if @milestone.due_date || @milestone.start_date
-      = milestone_date_range(@milestone)
-  .milestone-buttons
-    - if can?(current_user, :admin_milestone, @project)
-      = link_to edit_project_milestone_path(@project, @milestone), class: 'btn btn-grouped btn-nr' do
-        = _('Edit')
-
-      - if @project.group
-        %button.js-promote-project-milestone-button.btn.btn-grouped{ data: { toggle: 'modal',
-          target: '#promote-milestone-modal',
-          milestone_title: @milestone.title,
-          group_name: @project.group.name,
-          url: promote_project_milestone_path(@milestone.project, @milestone),
-          container: 'body' },
-          disabled: true,
-          type: 'button' }
-          = _('Promote')
-        #promote-milestone-modal
-
-      - if @milestone.active?
-        = link_to _('Close milestone'), project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: 'btn btn-close btn-nr btn-grouped'
-      - else
-        = link_to _('Reopen milestone'), project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: 'btn btn-reopen btn-nr btn-grouped'
-
-      = render 'shared/milestones/delete_button'
-
-    %a.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: '#' }
-      = icon('angle-double-left')
-
-.detail-page-description.milestone-detail
-  %h2.title.qa-milestone-title
-    = markdown_field(@milestone, :title)
-
-  %div
-    - if @milestone.description.present?
-      .description.md
-        = markdown_field(@milestone, :description)
+= render 'shared/milestones/header', milestone: @milestone
+= render 'shared/milestones/description', milestone: @milestone
 
 = render_if_exists 'shared/milestones/burndown', milestone: @milestone, project: @project