diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-07-17 17:15:27 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-07-17 17:15:27 +0000 |
| commit | a84ed6eb234c9a9f0e5e5c0deea1779d224764a8 (patch) | |
| tree | 1119d7c281686c123b44a9d8a2b56e2d33e2fd0f /app/views | |
| parent | c413a5507db2063fbb01e5a81e8c5c52889f7ffe (diff) | |
| parent | df2bb60f90315a77718b9122e9d06f5655750640 (diff) | |
| download | gitlab-ce-a84ed6eb234c9a9f0e5e5c0deea1779d224764a8.tar.gz | |
Merge branch 'add-support-remove-milestone' into 'master'
Add support for destroying project milestones
### What does this MR do?
This MR adds a "Remove" button to the project milestones page and the milestone page itself.
### Why was this MR needed?
Because lots of people talked about needing to clean their toilets. :)
### What are the relevant issue numbers?
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
### Screenshots
See merge request !980
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/milestones/_milestone.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/views/projects/milestones/_milestone.html.haml b/app/views/projects/milestones/_milestone.html.haml index 14a0580f966..2ce5358fa74 100644 --- a/app/views/projects/milestones/_milestone.html.haml +++ b/app/views/projects/milestones/_milestone.html.haml @@ -5,6 +5,10 @@ %i.fa.fa-pencil-square-o Edit = link_to 'Close Milestone', namespace_project_milestone_path(@project.namespace, @project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close" + = link_to namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-sm btn-remove" do + %i.fa.fa-trash-o + Remove + %h4 = link_to_gfm truncate(milestone.title, length: 100), namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone) - if milestone.expired? and not milestone.closed? diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 5947498e379..7b1681df336 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -19,6 +19,9 @@ = link_to 'Close Milestone', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-close btn-grouped" - else = link_to 'Reopen Milestone', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-reopen btn-grouped" + = link_to namespace_project_milestone_path(@project.namespace, @project, @milestone), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-grouped btn-remove" do + %i.fa.fa-trash-o + Remove %hr - if @milestone.issues.any? && @milestone.can_be_closed? |