diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-08 20:35:35 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-03-08 20:35:35 +0300 |
| commit | 18042714e8e5241d03980abc71ba26bef8535a9c (patch) | |
| tree | 6a5f8d4ea9ba5a343f7b8093c845b9f90e9e1f3f /app/views/shared/milestones/_milestone.html.haml | |
| parent | adc5aabc2064dc1e187f463f8ebde730502402af (diff) | |
| parent | 117ccb8926093ab97ea47e3216370112b2aafce1 (diff) | |
Merge branch 'jivl-fix-delete-milestone-button-showing-up' into 'master'
Fix delete milestone button showing up for all users
Closes #43778
See merge request gitlab-org/gitlab-ce!17576
Diffstat (limited to 'app/views/shared/milestones/_milestone.html.haml')
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 9db2a321526..5926867e2d7 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -63,13 +63,13 @@ = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-xs btn-close btn-grouped" - %button.js-delete-milestone-button.btn.btn-xs.btn-grouped.btn-danger{ data: { toggle: 'modal', - target: '#delete-milestone-modal', - milestone_id: milestone.id, - milestone_title: markdown_field(milestone, :title), - milestone_url: project_milestone_path(milestone.project, milestone), - milestone_issue_count: milestone.issues.count, - milestone_merge_request_count: milestone.merge_requests.count }, - disabled: true } - = _('Delete') - = icon('spin spinner', class: 'js-loading-icon hidden' ) + %button.js-delete-milestone-button.btn.btn-xs.btn-grouped.btn-danger{ data: { toggle: 'modal', + target: '#delete-milestone-modal', + milestone_id: milestone.id, + milestone_title: markdown_field(milestone, :title), + milestone_url: project_milestone_path(milestone.project, milestone), + milestone_issue_count: milestone.issues.count, + milestone_merge_request_count: milestone.merge_requests.count }, + disabled: true } + = _('Delete') + = icon('spin spinner', class: 'js-loading-icon hidden' ) |