summaryrefslogtreecommitdiff
path: root/app/views/projects/milestones
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-11-19 15:46:04 +0100
committerDouwe Maan <douwe@gitlab.com>2015-11-19 15:46:04 +0100
commitf5a630111fb1499a1541e77040529f74ca6475ec (patch)
treec3c82cd23d7bdcbfe4ec38d12be4572a6e8653ee /app/views/projects/milestones
parent28af56dea5a88ffcaceb082cf67c9c1ab021609d (diff)
parentc8074b6b115c95c68d5f7df300a391b4eab521d5 (diff)
downloadgitlab-ce-f5a630111fb1499a1541e77040529f74ca6475ec.tar.gz
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'app/views/projects/milestones')
-rw-r--r--app/views/projects/milestones/_form.html.haml6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 255ddab479f..24879b19d2b 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -23,9 +23,7 @@
.col-sm-10
= render layout: 'projects/md_preview', locals: { preview_class: "md-preview" } do
= render 'projects/zen', f: f, attr: :description, classes: 'description form-control js-quick-submit'
- .hint
- .pull-left Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
- .pull-left Attach files by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
+ = render 'projects/notes/hints'
.clearfix
.error-alert
.col-md-6
@@ -45,7 +43,7 @@
:javascript
- $( ".datepicker" ).datepicker({
+ $(".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()));