diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-02-16 18:11:36 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-03-01 16:10:03 -0600 |
| commit | d5c001864964afb73efca0c6b592f8a1e4d152b9 (patch) | |
| tree | c1859c340ae1f161a0ae6897ee4997c896a2a9fa /app/views/projects/milestones | |
| parent | 5c4eace67f188da436b3b380a0125d053b29422a (diff) | |
| download | gitlab-ce-d5c001864964afb73efca0c6b592f8a1e4d152b9.tar.gz | |
Added vue based promotion modals for labels and milestones
Diffstat (limited to 'app/views/projects/milestones')
| -rw-r--r-- | app/views/projects/milestones/index.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml index 6a7bc4b1888..5b0197ed58c 100644 --- a/app/views/projects/milestones/index.html.haml +++ b/app/views/projects/milestones/index.html.haml @@ -13,6 +13,7 @@ .milestones #delete-milestone-modal + #promote-milestone-modal %ul.content-list = render @milestones diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index de381d489c6..630a0583359 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -27,8 +27,14 @@ Edit - if @project.group - = link_to promote_project_milestone_path(@milestone.project, @milestone), title: "Promote to Group Milestone", class: 'btn 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.btn.btn-grouped{ data: { toggle: 'modal', + target: '#promote-milestone-modal', + milestone_title: @milestone.title, + url: promote_project_milestone_path(@milestone.project, @milestone), + container: 'body', + disabled: true } } + = _('Promote') + #promote-milestone-modal - if @milestone.active? = link_to 'Close milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-close btn-nr btn-grouped" |