diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-05 13:23:43 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-14 10:28:05 +0100 |
| commit | 6e93bd56f0147929006daba6410aa5640403b2c7 (patch) | |
| tree | b9516c34c88d02f1c2248b8db93609e87cace774 | |
| parent | 3de09d1475db3d23f839991e57d16e00bff07cb4 (diff) | |
| download | gitlab-ce-6e93bd56f0147929006daba6410aa5640403b2c7.tar.gz | |
Placeholder on milestone form
Updated JS spec to include gl_form
| -rw-r--r-- | app/views/projects/milestones/_form.html.haml | 2 | ||||
| -rw-r--r-- | spec/javascripts/notes_spec.js.coffee | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index 06b21754797..687222fa92f 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -10,7 +10,7 @@ = f.label :description, "Description", class: "control-label" .col-sm-10 = render layout: 'projects/md_preview', locals: { preview_class: "md-preview" } do - = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea' + = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...' = render 'projects/notes/hints' .clearfix .error-alert diff --git a/spec/javascripts/notes_spec.js.coffee b/spec/javascripts/notes_spec.js.coffee index 050b6e362c6..dd160e821b3 100644 --- a/spec/javascripts/notes_spec.js.coffee +++ b/spec/javascripts/notes_spec.js.coffee @@ -1,4 +1,5 @@ #= require notes +#= require gl_form window.gon = {} window.disableButtonIfEmptyField = -> null |