diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-23 14:45:02 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-23 14:45:02 +0000 |
| commit | ad85f1ea78bc7d58db2e11fc47e9d02ac5f4d3d2 (patch) | |
| tree | d4177bd67f826e81b89daa618c8f509f7634a81b | |
| parent | 91bb99502958a1cd468ad9a7e88db76ccb03f1d6 (diff) | |
| parent | 8be0c60e4069cd07ee4ae4d4f2508b554a0d16c3 (diff) | |
| download | gitlab-ce-ad85f1ea78bc7d58db2e11fc47e9d02ac5f4d3d2.tar.gz | |
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
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index db972ec572d..80e7342455b 100644 --- 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" |