diff options
| author | Valery Sizov <valery@gitlab.com> | 2016-11-15 20:48:30 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2016-11-23 14:41:04 +0300 |
| commit | 3789cfe056c1d8a5fb91267cc2b1dd0f9f5902a9 (patch) | |
| tree | 45314bfcb16ba7095e209d3a1f3eb9be2016b2a6 /app/views/projects | |
| parent | d7eeb6df51ffe2ad864ef49d0e465b88ab158520 (diff) | |
Add a starting date to milestones
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/milestones/_form.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index cbf1ba04170..513710e8e66 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -14,12 +14,7 @@ = render 'projects/notes/hints' .clearfix .error-alert - .col-md-6 - .form-group - = 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 + = render "shared/milestones/form_dates", f: f .form-actions - if @milestone.new_record? diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index e01aca3dda6..c3a6096aa54 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -10,15 +10,17 @@ Closed - elsif @milestone.expired? Past due + - elsif @milestone.upcoming? + Upcoming - else Open .header-text-content %span.identifier Milestone ##{@milestone.iid} - - if @milestone.expires_at + - if @milestone.due_date || @milestone.start_date %span.creator · - = @milestone.expires_at + = milestone_date_range(@milestone) .milestone-buttons - if can?(current_user, :admin_milestone, @project) - if @milestone.active? |