diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-06 17:37:33 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-06 17:37:33 +0000 |
| commit | a3b3b5d383a808d036e70616df759de029109756 (patch) | |
| tree | 55a40d9797e28cb305a4918ae1b9cfca9efe9756 | |
| parent | 0b2a28b999ab32eff32d6acc8faba04eabcd73da (diff) | |
| parent | cb537324a38f6680741f2da8c074ff7220e75a4f (diff) | |
| download | gitlab-ce-a3b3b5d383a808d036e70616df759de029109756.tar.gz | |
Merge branch 'fixed-edit-form-failing-test' into 'master'
Fixed edit form authenticity_token call failing the tests
See merge request !8472
| -rw-r--r-- | app/assets/javascripts/notes.js | 4 | ||||
| -rw-r--r-- | app/views/projects/notes/_edit_form.html.haml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 8de5a6191b6..603db88567d 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -895,7 +895,9 @@ new GLForm($editForm.find('form')); - $editForm.find('form').attr('action', postUrl); + $editForm.find('form') + .attr('action', postUrl) + .attr('data-remote', 'true'); $editForm.find('.js-form-target-id').val(targetId); $editForm.find('.js-form-target-type').val(targetType); $editForm.find('.js-note-text').focus().val(originalContent); diff --git a/app/views/projects/notes/_edit_form.html.haml b/app/views/projects/notes/_edit_form.html.haml index d36b4e6c8ab..e8e450742b5 100644 --- a/app/views/projects/notes/_edit_form.html.haml +++ b/app/views/projects/notes/_edit_form.html.haml @@ -1,6 +1,5 @@ .note-edit-form - = form_tag '#', method: :put, remote: true, class: 'edit-note common-note-form js-quick-submit' do - = hidden_field_tag :authenticity_token, form_authenticity_token + = form_tag '#', method: :put, class: 'edit-note common-note-form js-quick-submit' do = hidden_field_tag :target_id, '', class: 'js-form-target-id' = hidden_field_tag :target_type, '', class: 'js-form-target-type' = render layout: 'projects/md_preview', locals: { preview_class: 'md-preview', referenced_users: true } do |