diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 20:52:09 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 20:52:09 +0000 |
| commit | f0c58c72a9abc81103533e4e456838b523626c43 (patch) | |
| tree | fa71e205e91e602d575b667b1390ca7e812ea427 /app/views/projects/milestones | |
| parent | be37ff7acb25cd8fe78ef4f202426502f8db510f (diff) | |
| parent | ff702bd6e05520a2cb695a03984a35ed981c6561 (diff) | |
| download | gitlab-ce-f0c58c72a9abc81103533e4e456838b523626c43.tar.gz | |
Merge branch 'milestone-date-clear' into 'master'
Due date can be removed from milestones
## What does this MR do?
Adds a button to milestone form to allow user to remove due date
## What are the relevant issue numbers?
Closes #15063
## Screenshots (if relevant)
See merge request !4428
Diffstat (limited to 'app/views/projects/milestones')
| -rw-r--r-- | app/views/projects/milestones/_form.html.haml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index f5e2b927da8..cbf1ba04170 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -19,6 +19,7 @@ = f.label :due_date, "Due Date", class: "control-label" .col-sm-10 = f.text_field :due_date, class: "datepicker form-control", placeholder: "Select due date" + %a.inline.prepend-top-5.js-clear-due-date{ href: "#" } Clear due date .form-actions - if @milestone.new_record? @@ -27,10 +28,3 @@ -else = f.submit 'Save changes', class: "btn-save btn" = link_to "Cancel", namespace_project_milestone_path(@project.namespace, @project, @milestone), class: "btn btn-cancel" - - -:javascript - $(".datepicker").datepicker({ - dateFormat: "yy-mm-dd", - onSelect: function(dateText, inst) { $("#milestone_due_date").val(dateText) } - }).datepicker("setDate", $.datepicker.parseDate('yy-mm-dd', $('#milestone_due_date').val())); |