diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-04-18 06:02:12 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-04-18 06:02:12 +0300 |
| commit | e9f20f5922e9c365b4af14e53881a7bafba4139c (patch) | |
| tree | 0eb76bf2d2934ccf982d8bc71fd31f4103a40d67 /app | |
| parent | 1c93b33587a5e0a0596b43772ee9e709e9962368 (diff) | |
| parent | 0be158a0725c254629e7e4e5de194021322e2fa9 (diff) | |
Merge branch 'fix-issue-dropzone' into 'master'
Fixed issue with dropzone not working on new issuable
Closes #15295
See merge request !3760
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/_md_preview.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml index 7a78d61a611..8de44a6c914 100644 --- a/app/views/projects/_md_preview.html.haml +++ b/app/views/projects/_md_preview.html.haml @@ -1,6 +1,6 @@ .md-area .md-header - %ul.nav-links + %ul.nav-links.clearfix %li.active %a.js-md-write-button{ href: "#md-write-holder", tabindex: -1 } Write diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index aed2622a6da..bae15b7f844 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -4,7 +4,7 @@ = f.label :title, class: 'control-label' .col-sm-10 = f.text_field :title, maxlength: 255, autofocus: true, autocomplete: 'off', - class: 'form-control pad js-gfm-input', required: true + class: 'form-control pad', required: true - if issuable.is_a?(MergeRequest) %p.help-block |