diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-08-16 16:26:45 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-08-16 16:26:45 +0300 |
| commit | 853799923d000c0386e6895bb91ed05e2886e068 (patch) | |
| tree | 67dc1d91815e829e15ce62bba0583d1c2285e824 /app | |
| parent | ee4528526e1bbf58f256c0fcc27873fcdf80daa4 (diff) | |
| parent | bd90dfab87f20769f637938806a4bcf0eecf92a2 (diff) | |
Merge branch '36430-edit-milestone-link' into 'master'
Fix edit milestone path from group milestones list
Closes #36430
See merge request !13581
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_top.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 6f6a036b13f..6a85f7d0564 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -32,7 +32,7 @@ .col-sm-6.milestone-actions - if can?(current_user, :admin_milestones, @group) - if milestone.is_group_milestone? - = link_to edit_group_milestone_path(@group, milestone.id), class: "btn btn-xs btn-grouped" do + = link_to edit_group_milestone_path(@group, milestone), class: "btn btn-xs btn-grouped" do Edit \ - if milestone.closed? diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml index b93837e3087..3014300fbe7 100644 --- a/app/views/shared/milestones/_top.html.haml +++ b/app/views/shared/milestones/_top.html.haml @@ -23,7 +23,7 @@ .pull-right - if can?(current_user, :admin_milestones, group) - if milestone.is_group_milestone? - = link_to edit_group_milestone_path(group, milestone.iid), class: "btn btn btn-grouped" do + = link_to edit_group_milestone_path(group, milestone), class: "btn btn btn-grouped" do Edit - if milestone.active? = link_to 'Close Milestone', group_milestone_route(milestone, {state_event: :close }), method: :put, class: "btn btn-grouped btn-close" |