diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-12 15:10:40 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-12 15:10:40 +0000 |
| commit | 09ab85a936efad43d7ab01cb5dbfd533640ce2ef (patch) | |
| tree | e0d6916d1501351998728616ca2ea13ec7a28b71 /app/views | |
| parent | 1e54e30ffc017efa350e2f372513aa55b5a0bd0c (diff) | |
| download | gitlab-ce-09ab85a936efad43d7ab01cb5dbfd533640ce2ef.tar.gz | |
Revert "Merge branch '44870-remove-extra-space-around-comment-form-on-merge-requests' into 'master'"
This reverts merge request !18120
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/notes/_form.html.haml | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/app/views/shared/notes/_form.html.haml b/app/views/shared/notes/_form.html.haml index 725bf916592..71c0d740bc8 100644 --- a/app/views/shared/notes/_form.html.haml +++ b/app/views/shared/notes/_form.html.haml @@ -24,20 +24,21 @@ -# DiffNote = f.hidden_field :position - = render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do - = render 'projects/zen', f: f, - attr: :note, - classes: 'note-textarea js-note-text', - placeholder: "Write a comment or drag your files here...", - supports_quick_actions: supports_quick_actions, - supports_autocomplete: supports_autocomplete - = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions - .error-alert - - .note-form-actions.clearfix - = render partial: 'shared/notes/comment_button' - - = yield(:note_actions) - - %a.btn.btn-cancel.js-note-discard{ role: "button", data: {cancel_text: "Cancel" } } - Discard draft + .discussion-form-container + = render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do + = render 'projects/zen', f: f, + attr: :note, + classes: 'note-textarea js-note-text', + placeholder: "Write a comment or drag your files here...", + supports_quick_actions: supports_quick_actions, + supports_autocomplete: supports_autocomplete + = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions + .error-alert + + .note-form-actions.clearfix + = render partial: 'shared/notes/comment_button' + + = yield(:note_actions) + + %a.btn.btn-cancel.js-note-discard{ role: "button", data: {cancel_text: "Cancel" } } + Discard draft |