diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-07 19:43:29 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-07 19:43:29 +0300 |
| commit | ce819eceea58f1452f59ffc275a4c8cb6c5da0d8 (patch) | |
| tree | eb4ae38b9eb1e99b2570b352b457dba878297d81 /app/views/shared/milestones/_milestone.html.haml | |
| parent | 5afa1c6e6aad2c5adaefecd1d81d9da8c7317191 (diff) | |
| parent | a16547e5c2d42bfe7af025556e90f0f895a97f59 (diff) | |
Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'
Resolve: Modal and banner designs for project label and project milestone promotion
Closes #41895
See merge request gitlab-org/gitlab-ce!17197
Diffstat (limited to 'app/views/shared/milestones/_milestone.html.haml')
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index da01fc02d07..9db2a321526 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -51,8 +51,15 @@ \ - if @project.group - = link_to promote_project_milestone_path(milestone.project, milestone), title: "Promote to Group Milestone", class: 'btn btn-xs btn-grouped', data: { confirm: "Promoting #{milestone.title} will make it available for all projects inside #{@project.group.name}. Existing project milestones with the same name will be merged. This action cannot be reversed.", toggle: "tooltip" }, method: :post do - Promote + %button.js-promote-project-milestone-button.btn.btn-xs.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'), + disabled: true, + type: 'button', + data: { url: promote_project_milestone_path(milestone.project, milestone), + milestone_title: milestone.title, + target: '#promote-milestone-modal', + container: 'body', + toggle: 'modal' } } + = _('Promote') = 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" |