1 files changed, 38 insertions, 23 deletions
diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml
index 58ea0a356ae..149dfdb9158 100644
--- a/app/views/shared/milestones/_top.html.haml
+++ b/app/views/shared/milestones/_top.html.haml
@@ -22,6 +22,9 @@
   - if group
     .pull-right
       - if can?(current_user, :admin_milestones, group)
+        - if milestone.is_group_milestone?
+          = link_to edit_group_milestone_path(group, milestone.safe_title, title: milestone.title), class: "btn btn btn-grouped" do
+            Edit
         - if milestone.active?
           = link_to 'Close Milestone', group_milestone_path(group, milestone.safe_title, title: milestone.title, milestone: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close"
         - else
@@ -30,32 +33,44 @@
 .detail-page-description.milestone-detail
   %h2.title
     = markdown_field(milestone, :title)
+  - if @milestone.is_group_milestone? && @milestone.description.present?
+    %div
+      .description
+        .wiki
+          = markdown_field(@milestone, :description)
 
 - if milestone.complete?(current_user) && milestone.active?
   .alert.alert-success.prepend-top-default
     - close_msg = group ? 'You may close the milestone now.' : 'Navigate to the project to close the milestone.'
     %span All issues for this milestone are closed. #{close_msg}
 
-%h2 Only link to group milestone issues instead of list(for now)
-/ .table-holder
-/   %table.table
-/     %thead
-/       %tr
-/         %th Project
-/         %th Open issues
-/         %th State
-/         %th Due date
-/     - milestone.milestones.each do |ms|
-/       %tr
-/         %td
-/           - project_name = group ? ms.project.name : ms.project.name_with_namespace
-/           = link_to project_name, namespace_project_milestone_path(ms.project.namespace, ms.project, ms)
-/         %td
-/           = ms.issues_visible_to_user(current_user).opened.count
-/         %td
-/           - if ms.closed?
-/             Closed
-/           - else
-/             Open
-/         %td
-/           = ms.expires_at
+- if @milestone.is_legacy_group_milestone?
+  .table-holder
+    %table.table
+      %thead
+        %tr
+          %th Project
+          %th Open issues
+          %th State
+          %th Due date
+      - milestone.milestones.each do |ms|
+        %tr
+          %td
+            - project_name = group ? ms.project.name : ms.project.name_with_namespace
+            = link_to project_name, namespace_project_milestone_path(ms.project.namespace, ms.project, ms)
+          %td
+            = ms.issues_visible_to_user(current_user).opened.count
+          %td
+            - if ms.closed?
+              Closed
+            - else
+              Open
+          %td
+            = ms.expires_at
+- elsif @milestone.is_group_milestone?
+  %br
+  View
+  = link_to 'Issues', issues_group_path(@group, milestone_title: milestone.title)
+  or
+  = link_to 'Merge Requests', merge_requests_group_path(@group, milestone_title: milestone.title)
+  in this milestone