Merge branch 'remove_extra_css_class_from_markdown' into 'master'

Remove extra css class from markdown Extra css class prevented attachments uploader from functioning correctly. This caused dropzone wrapper classes to be appended to the wrong class and further prevented the dropzone gem from functioning correctly. Removing this extra class allows attachment upload to function again while keeping the feature introduced here intact. Fixes #1831 See merge request !1338

Merge branch 'remove_extra_css_class_from_markdown' into 'master'
ad85f1ea · Dmitriy Zaporozhets · 91bb9950 · 8be0c60e · ad85f1ea
Commit ad85f1ea authored Dec 23, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

_note.html.haml app/views/projects/notes/_note.html.haml +1 -1

No files found.
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -46,7 +46,7 @@
        .note-edit-form
          = form_for note, url: project_note_path(@project, note), method: :put, remote: true, authenticity_token: true do |f|
            = render layout: 'projects/md_preview' do
-              = f.text_area :note, class: 'note_text js-note-text markdown-area js-gfm-input turn-on'
+              = f.text_area :note, class: 'note_text js-note-text js-gfm-input turn-on'

            .form-actions.clearfix
              = f.submit 'Save changes', class: "btn btn-primary btn-save js-comment-button"