diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-13 16:57:46 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-13 16:57:46 -0500 |
| commit | 1eb3e8acb61e837768d3aea93ae28b819efb9702 (patch) | |
| tree | 4511e8b4f9fa0ed5182acef96f2ba06d5bdf6525 /app/assets/javascripts/notes.js.coffee | |
| parent | 0e344aa2299d2f6911282de5d4808c70d658d372 (diff) | |
| download | gitlab-ce-closing-mr-bug-fix.tar.gz | |
fixes bug with commenting on merge requestsclosing-mr-bug-fix
Diffstat (limited to 'app/assets/javascripts/notes.js.coffee')
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 8ba00ecbbab..fcf50dd1b51 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -521,9 +521,13 @@ class @Notes if textarea.val().trim().length > 0 form.find('.js-note-target-reopen').text('Comment & reopen') form.find('.js-note-target-close').text('Comment & close') + form.find('.js-note-target-reopen').addClass('btn-comment-and-reopen') + form.find('.js-note-target-close').addClass('btn-comment-and-close') else form.find('.js-note-target-reopen').text('Reopen') form.find('.js-note-target-close').text('Close') + form.find('.js-note-target-reopen').removeClass('btn-comment-and-reopen') + form.find('.js-note-target-close').removeClass('btn-comment-and-close') initTaskList: -> @enableTaskList() |