fixes bug with commenting on merge requests

app/assets/javascripts/merge_request.js.coffee

@@ -48,15 +48,16 @@ class @MergeRequest
     _this = @
     $('a.btn-close, a.btn-reopen').on 'click', (e) ->
       $this = $(this)
-      if $this.data('submitted')
+      shouldSubmit = $this.hasClass('btn-comment')
+      if shouldSubmit && $this.data('submitted')
         return
+      if shouldSubmit
+        if $this.hasClass('btn-comment-and-close') || $this.hasClass('btn-comment-and-reopen')
           e.preventDefault()
           e.stopImmediatePropagation()
-      shouldSubmit = $this.hasClass('btn-comment')
-      console.log("shouldSubmit")
-      if shouldSubmit
           _this.submitNoteForm($this.closest('form'),$this)
 
+
   submitNoteForm: (form, $button) =>
     noteText = form.find("textarea.js-note-text").val()
     if noteText.trim().length > 0

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()