From 8e74460534cdb0081ca1ac3e52892a4ebad05fe3 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 29 Dec 2015 12:53:21 -0500
Subject: adds ajax to bottom discussion buttons. Now submits issue and closes
 via ajax.

---
 app/assets/javascripts/issue.js.coffee          | 12 +++++++++++-
 app/assets/javascripts/notes.js.coffee          | 16 ++--------------
 app/views/projects/issues/_discussion.html.haml |  6 ++----
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee
index c256ec8f41b..0d26c58a81d 100644
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -16,12 +16,16 @@ class @Issue
     $(document).on 'tasklist:changed', '.detail-page-description .js-task-list-container', @updateTaskList
 
   initIssueBtnEventListeners: ->
+    _this = @
     issueFailMessage = 'Unable to update this issue at this time.'
     $('a.btn-close, a.btn-reopen').on 'click', (e) ->
       e.preventDefault()
       e.stopImmediatePropagation()
       $this = $(this)
       isClose = $this.hasClass('btn-close')
+      shouldSubmit = $this.hasClass('btn-comment')
+      if shouldSubmit
+        _this.submitNoteForm($this.closest('form'))
       $this.prop('disabled', true)
       url = $this.attr('href')
       $.ajax
@@ -32,12 +36,13 @@ class @Issue
           new Flash(issueFailMessage, 'alert')
         success: (data, textStatus, jqXHR) ->
           if data.saved
-            $this.addClass('hidden')
             if isClose
+              $('a.btn-close').addClass('hidden')
               $('a.btn-reopen').removeClass('hidden')
               $('div.status-box-closed').removeClass('hidden')
               $('div.status-box-open').addClass('hidden')
             else
+              $('a.btn-reopen').addClass('hidden')
               $('a.btn-close').removeClass('hidden')
               $('div.status-box-closed').addClass('hidden')
               $('div.status-box-open').removeClass('hidden')
@@ -45,6 +50,11 @@ class @Issue
             new Flash(issueFailMessage, 'alert')
           $this.prop('disabled', false)
 
+  submitNoteForm: (form) =>
+    noteText = form.find("textarea.js-note-text").val()
+    if noteText.trim().length > 0
+      form.submit()
+
   disableTaskList: ->
     $('.detail-page-description .js-task-list-container').taskList('disable')
     $(document).off 'tasklist:changed', '.detail-page-description .js-task-list-container'
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 9e5204bfeeb..ba0de896201 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -19,6 +19,8 @@ class @Notes
     @cleanBinding()
     @addBinding()
     @initTaskList()
+    # for updating the comment disscussion buttons once that issue #5534 is approved.
+    # @updateTargetButtons({target:$("#note_note")})
 
   addBinding: ->
     # add note to UI after creation
@@ -33,8 +35,6 @@ class @Notes
     $(document).on "click", ".note-edit-cancel", @cancelEdit
 
     # Reopen and close actions for Issue/MR combined with note form submit
-    $(document).on "click", ".js-note-target-reopen", @targetReopen
-    $(document).on "click", ".js-note-target-close", @targetClose
     $(document).on "click", ".js-comment-button", @updateCloseButton
     $(document).on "keyup", ".js-note-text", @updateTargetButtons
 
@@ -512,17 +512,6 @@ class @Notes
   visibilityChange: =>
     @refresh()
 
-  targetReopen: (e) =>
-    @submitNoteForm($(e.target).parents('form'))
-
-  targetClose: (e) =>
-    @submitNoteForm($(e.target).parents('form'))
-
-  submitNoteForm: (form) =>
-    noteText = form.find(".js-note-text").val()
-    if noteText.trim().length > 0
-      form.submit()
-
   updateCloseButton: (e) =>
     textarea = $(e.target)
     form = textarea.parents('form')
@@ -531,7 +520,6 @@ class @Notes
   updateTargetButtons: (e) =>
     textarea = $(e.target)
     form = textarea.parents('form')
-
     if textarea.val().trim().length > 0
       form.find('.js-note-target-reopen').text('Comment & reopen')
       form.find('.js-note-target-close').text('Comment & close')
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml
index dc434cf38c4..673020a4e30 100644
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
@@ -1,9 +1,7 @@
 - content_for :note_actions do
   - if can?(current_user, :update_issue, @issue)
-    - if @issue.closed?
-      = link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true), method: :put, class: 'btn btn-nr btn-grouped btn-reopen js-note-target-reopen', title: 'Reopen Issue'
-    - else
-      = link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close}, status_only: true), method: :put, class: 'btn btn-nr btn-grouped btn-close js-note-target-close', title: 'Close Issue'
+    = link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "btn btn-nr btn-grouped btn-reopen btn-comment js-note-target-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen Issue'
+    = link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close}, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "btn btn-nr btn-grouped btn-close btn-comment js-note-target-close #{issue_button_visibility(@issue, true)}", title: 'Close Issue'
 
 #notes
   = render 'projects/notes/notes_with_form'
-- 
cgit v1.2.1


From 5a997a02a2cd71877d2af7b72fb67e86722882b2 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Wed, 30 Dec 2015 06:29:56 -0500
Subject: removes commented out code.

---
 app/assets/javascripts/notes.js.coffee | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index ba0de896201..8ba00ecbbab 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -19,8 +19,6 @@ class @Notes
     @cleanBinding()
     @addBinding()
     @initTaskList()
-    # for updating the comment disscussion buttons once that issue #5534 is approved.
-    # @updateTargetButtons({target:$("#note_note")})
 
   addBinding: ->
     # add note to UI after creation
-- 
cgit v1.2.1


From cbdc8dd46ff2b74e5817053f774cc8f17db55f77 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 5 Jan 2016 20:42:25 -0500
Subject: adds ajax open and close merges, with discussion/comments working as
 well

---
 app/assets/javascripts/merge_request.js.coffee     | 43 ++++++++++++++++++++++
 app/helpers/merge_requests_helper.rb               |  4 ++
 app/models/merge_request.rb                        | 10 -----
 .../projects/merge_requests/_discussion.html.haml  |  9 ++---
 .../merge_requests/show/_mr_title.html.haml        | 26 ++++++++-----
 5 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee
index 9047587db81..8c321319b30 100644
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -22,6 +22,7 @@ class @MergeRequest
 
     if $("a.btn-close").length
       @initTaskList()
+      @initMergeRequestBtnEventListeners()
 
   # Local jQuery finder
   $: (selector) ->
@@ -35,6 +36,48 @@ class @MergeRequest
       # Show the first tab (Commits)
       $('.merge-request-tabs a[data-toggle="tab"]:first').tab('show')
 
+  initMergeRequestBtnEventListeners: ->
+    _this = @
+    mergeRequestFailMessage = 'Unable to update this merge request at this time.'
+    $('a.btn-close, a.btn-reopen').on 'click', (e) ->
+      e.preventDefault()
+      e.stopImmediatePropagation()
+      $this = $(this)
+      isClose = $this.hasClass('btn-close')
+      shouldSubmit = $this.hasClass('btn-comment')
+      if shouldSubmit
+        _this.submitNoteForm($this.closest('form'))
+      $this.prop('disabled', true)
+      url = $this.attr('href')
+      $.ajax
+        type: 'PUT',
+        url: url,
+        error: (jqXHR, textStatus, errorThrown) ->
+          mergeRequestStatus = if isClose then 'close' else 'open'
+          new Flash(mergeRequestFailMessage, 'alert')
+        success: (data, textStatus, jqXHR) ->
+          if data.saved
+            if isClose
+              $('a.btn-close').addClass('hidden')
+              $('a.issuable-edit').addClass('hidden')
+              $('a.btn-reopen').removeClass('hidden')
+              $('div.status-box-closed').removeClass('hidden')
+              $('div.status-box-open').addClass('hidden')
+            else
+              $('a.btn-reopen').addClass('hidden')
+              $('a.issuable-edit').removeClass('hidden')
+              $('a.btn-close').removeClass('hidden')
+              $('div.status-box-closed').addClass('hidden')
+              $('div.status-box-open').removeClass('hidden')
+          else
+            new Flash(mergeRequestFailMessage, 'alert')
+          $this.prop('disabled', false)
+
+  submitNoteForm: (form) =>
+    noteText = form.find("textarea.js-note-text").val()
+    if noteText.trim().length > 0
+      form.submit()
+
   showAllCommits: ->
     this.$('.first-commits').remove()
     this.$('.all-commits').removeClass 'hide'
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 1dd07a2a220..fafe2acd538 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -19,6 +19,10 @@ module MergeRequestsHelper
     }
   end
 
+  def merge_request_button_visibility(mr, closed)    
+    return 'hidden' if mr.closed? == closed
+  end
+
   def mr_css_classes(mr)
     classes = "merge-request"
     classes << " closed" if mr.closed?
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index ac25d38eb63..f013018ec08 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -456,16 +456,6 @@ class MergeRequest < ActiveRecord::Base
     ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
   end
 
-  def state_human_name
-    if merged?
-      "Merged"
-    elsif closed?
-      "Closed"
-    else
-      "Open"
-    end
-  end
-
   def target_sha
     @target_sha ||= target_project.
       repository.commit(target_branch).sha
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml
index bff3c3b283d..ed3628a36a3 100644
--- a/app/views/projects/merge_requests/_discussion.html.haml
+++ b/app/views/projects/merge_requests/_discussion.html.haml
@@ -1,8 +1,7 @@
 - content_for :note_actions do
   - if can?(current_user, :update_merge_request, @merge_request)
-    - if @merge_request.open?
-      = link_to 'Close', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-nr btn-grouped btn-close close-mr-link js-note-target-close", title: "Close merge request"
-    - if @merge_request.closed?
-      = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request"
+    = link_to 'Close', merge_request_path(@merge_request, merge_request: {state_event: :close}, format: 'json'), data: {no_turbolinks: true}, method: :put, class: "btn btn-nr btn-grouped btn-close close-mr-link btn-comment js-note-target-close #{merge_request_button_visibility(@merge_request, true)}", title: "Close merge request"
+    = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen}, format: 'json'),  data: {no_turbolinks: true}, method: :put, class: "btn btn-nr btn-grouped btn-reopen reopen-mr-link btn-comment js-note-target-reopen #{merge_request_button_visibility(@merge_request, false)}", title: "Reopen merge request"
 
-#notes= render "projects/notes/notes_with_form"
+#notes
+  = render "projects/notes/notes_with_form"
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index fc6fb2a0d42..7996d35c462 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -1,6 +1,12 @@
 .detail-page-header
-  .status-box{ class: status_box_class(@merge_request) }
-    = @merge_request.state_human_name
+  - if @merge_request.merged?
+    .status-box{ class: "status-box-merged" }
+      Merged
+  - else
+    .status-box{ class: "status-box-closed #{merge_request_button_visibility(@merge_request, false)}"}
+      Closed
+    .status-box{ class: "status-box-open #{merge_request_button_visibility(@merge_request, true)}"}
+      Open
   %span.identifier
     Merge Request ##{@merge_request.iid}
   %span.creator
@@ -15,11 +21,11 @@
         = time_ago_with_tooltip(@merge_request.updated_at, placement: 'bottom')
 
   .issue-btn-group.pull-right
-    - if can?(current_user, :update_merge_request, @merge_request)
-      - if @merge_request.open?
-        = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: 'btn btn-nr btn-grouped btn-close', title: 'Close merge request'
-        = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-nr btn-grouped issuable-edit', id: 'edit_merge_request' do
-          %i.fa.fa-pencil-square-o
-          Edit
-      - if @merge_request.closed?
-        = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'btn btn-nr btn-grouped btn-reopen reopen-mr-link', title: 'Reopen merge request'
+    - if can?(current_user, :update_merge_request, @merge_request) && !@merge_request.merged?
+      
+      = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }, format: 'json'), data: {no_turbolink: true}, method: :put, class: "btn btn-nr btn-grouped btn-reopen reopen-mr-link #{merge_request_button_visibility(@merge_request, false)}", title: 'Reopen merge request'
+      = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }, format: 'json'), data: {no_turbolink: true}, method: :put, class: "btn btn-nr btn-grouped btn-close #{merge_request_button_visibility(@merge_request, true)}", title: 'Close merge request'
+
+      = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "btn btn-nr btn-grouped issuable-edit #{merge_request_button_visibility(@merge_request, true)}", id: 'edit_merge_request' do
+        %i.fa.fa-pencil-square-o
+        Edit
\ No newline at end of file
-- 
cgit v1.2.1


From f71642017ebfd409e20735b621dd3a9fe09add12 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Wed, 6 Jan 2016 07:33:50 -0500
Subject: adds tests (and passes them) for ajax open and close merge requests.

---
 .../fixtures/merge_requests_show.html.haml         | 12 ++-
 spec/javascripts/issue_spec.js.coffee              |  2 +-
 spec/javascripts/merge_request_spec.js.coffee      | 88 ++++++++++++++++++++++
 3 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/spec/javascripts/fixtures/merge_requests_show.html.haml b/spec/javascripts/fixtures/merge_requests_show.html.haml
index 8447dfdda32..fdfa8a273e2 100644
--- a/spec/javascripts/fixtures/merge_requests_show.html.haml
+++ b/spec/javascripts/fixtures/merge_requests_show.html.haml
@@ -1,4 +1,14 @@
-%a.btn-close
+:css
+  .hidden { display: none !important }
+
+.flash-container
+  .flash-alert
+  .flash-notice
+
+.status-box.status-box-open Open
+.status-box.status-box-closed.hidden Closed
+%a.btn-close{"href" => "http://gitlab.com/merge_requests/6/close"} Close
+%a.btn-reopen.hidden{"href" => "http://gitlab.com/merge_requests/6/reopen"} Reopen
 
 .detail-page-description
   .description.js-task-list-container
diff --git a/spec/javascripts/issue_spec.js.coffee b/spec/javascripts/issue_spec.js.coffee
index 7e67c778861..e1c22860da7 100644
--- a/spec/javascripts/issue_spec.js.coffee
+++ b/spec/javascripts/issue_spec.js.coffee
@@ -44,7 +44,7 @@ describe 'reopen/close issue', ->
     expect($('div.status-box-closed')).toBeVisible()
     expect($('div.status-box-open')).toBeHidden()
 
-  it 'fails to closes an issue with success:false', ->
+  it 'fails to close an issue with success:false', ->
 
     $.ajax = (obj) ->
       expect(obj.type).toBe('PUT')
diff --git a/spec/javascripts/merge_request_spec.js.coffee b/spec/javascripts/merge_request_spec.js.coffee
index 22ebc7039d1..e21bfde38ad 100644
--- a/spec/javascripts/merge_request_spec.js.coffee
+++ b/spec/javascripts/merge_request_spec.js.coffee
@@ -21,3 +21,91 @@ describe 'MergeRequest', ->
         expect(req.data.merge_request.description).not.toBe(null)
 
       $('.js-task-list-field').trigger('tasklist:changed')
+
+  describe 'reopen/close merge request', ->
+    fixture.preload('merge_requests_show.html')
+    beforeEach ->
+      fixture.load('merge_requests_show.html')
+      @merge_request = new MergeRequest({})
+    it 'closes a merge request', ->
+      $.ajax = (obj) ->
+        expect(obj.type).toBe('PUT')
+        expect(obj.url).toBe('http://gitlab.com/merge_requests/6/close')
+        obj.success saved:true
+
+      $btnClose = $('a.btn-close')
+      $btnReopen = $('a.btn-reopen')
+      expect($btnReopen).toBeHidden()
+      expect($btnClose.text()).toBe('Close')
+      expect(typeof $btnClose.prop('disabled')).toBe('undefined')
+
+      $btnClose.trigger('click')
+
+      expect($btnReopen).toBeVisible()
+
+      expect($btnClose).toBeHidden()
+      expect($('div.status-box-closed')).toBeVisible()
+      expect($('div.status-box-open')).toBeHidden()
+
+    it 'fails to close a merge request with success:false', ->
+
+      $.ajax = (obj) ->
+        expect(obj.type).toBe('PUT')
+        expect(obj.url).toBe('http://goesnowhere.nothing/whereami')
+        obj.success saved:false
+
+      $btnClose = $('a.btn-close')
+      $btnReopen = $('a.btn-reopen')
+      $btnClose.attr('href','http://goesnowhere.nothing/whereami')
+      expect($btnReopen).toBeHidden()
+      expect($btnClose.text()).toBe('Close')
+      expect(typeof $btnClose.prop('disabled')).toBe('undefined')
+
+      $btnClose.trigger('click')
+
+      expect($btnReopen).toBeHidden()
+      expect($btnClose).toBeVisible()
+      expect($('div.status-box-closed')).toBeHidden()
+      expect($('div.status-box-open')).toBeVisible()
+      expect($('div.flash-alert')).toBeVisible()
+      expect($('div.flash-alert').text()).toBe('Unable to update this merge request at this time.')
+
+    it 'fails to closes an issue with HTTP error', ->
+
+      $.ajax = (obj) ->
+        expect(obj.type).toBe('PUT')
+        expect(obj.url).toBe('http://goesnowhere.nothing/whereami')
+        obj.error()
+      
+      $btnClose = $('a.btn-close')
+      $btnReopen = $('a.btn-reopen')
+      $btnClose.attr('href','http://goesnowhere.nothing/whereami')
+      expect($btnReopen).toBeHidden()
+      expect($btnClose.text()).toBe('Close')
+      expect(typeof $btnClose.prop('disabled')).toBe('undefined')
+
+      $btnClose.trigger('click')
+      
+      expect($btnReopen).toBeHidden()
+      expect($btnClose).toBeVisible()
+      expect($('div.status-box-closed')).toBeHidden()
+      expect($('div.status-box-open')).toBeVisible()
+      expect($('div.flash-alert')).toBeVisible()
+      expect($('div.flash-alert').text()).toBe('Unable to update this merge request at this time.')    
+    
+    it 'reopens a merge request', ->
+      $.ajax = (obj) ->
+        expect(obj.type).toBe('PUT')
+        expect(obj.url).toBe('http://gitlab.com/merge_requests/6/reopen')
+        obj.success saved: true
+
+      $btnClose = $('a.btn-close')
+      $btnReopen = $('a.btn-reopen')
+      expect($btnReopen.text()).toBe('Reopen')
+
+      $btnReopen.trigger('click')
+
+      expect($btnReopen).toBeHidden()
+      expect($btnClose).toBeVisible()
+      expect($('div.status-box-open')).toBeVisible()
+      expect($('div.status-box-closed')).toBeHidden()
\ No newline at end of file
-- 
cgit v1.2.1


From ab9612df8dd97d83a94a8290f1530760e5cc7d2e Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Thu, 7 Jan 2016 11:47:39 -0500
Subject: initial json requests instead of HTML

---
 app/assets/javascripts/merge_request.js.coffee     |  6 ++++
 .../javascripts/merge_request_widget.js.coffee     |  5 +--
 .../projects/merge_requests_controller.rb          | 24 ++++++++++---
 app/helpers/merge_requests_helper.rb               |  9 +++++
 .../merge_requests/widget/_closed.html.haml        |  2 +-
 .../merge_requests/widget/_locked.html.haml        |  2 +-
 .../merge_requests/widget/_merged.html.haml        |  2 +-
 .../projects/merge_requests/widget/_open.html.haml | 39 +++++++++++-----------
 .../projects/merge_requests/widget/_show.html.haml | 14 +++-----
 .../merge_requests/widget/open/_archived.html.haml |  2 +-
 10 files changed, 66 insertions(+), 39 deletions(-)

diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee
index 8c321319b30..c6c7f37707f 100644
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -63,12 +63,18 @@ class @MergeRequest
               $('a.btn-reopen').removeClass('hidden')
               $('div.status-box-closed').removeClass('hidden')
               $('div.status-box-open').addClass('hidden')
+
+              $('div.mr-state-widget-closed').removeClass('hidden')
+              $('div.mr-state-widget-opened').addClass('hidden')
             else
               $('a.btn-reopen').addClass('hidden')
               $('a.issuable-edit').removeClass('hidden')
               $('a.btn-close').removeClass('hidden')
               $('div.status-box-closed').addClass('hidden')
               $('div.status-box-open').removeClass('hidden')
+
+              $('div.mr-state-widget-closed').addClass('hidden')
+              $('div.mr-state-widget-opened').removeClass('hidden')
           else
             new Flash(mergeRequestFailMessage, 'alert')
           $this.prop('disabled', false)
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index 738ffc8343b..f0a687f79b1 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -28,8 +28,9 @@ class @MergeRequestWidget
 
   getMergeStatus: ->
     $.get @opts.url_to_automerge_check, (data) ->
-      $('.mr-state-widget').replaceWith(data)
-
+      console.log("data",data);
+      # $('div.mr-state-widget.mr-state-widget-opened').replaceWith(data)
+      
   getCiStatus: ->
     if @opts.ci_enable
       $.get @opts.url_to_ci_check, (data) =>
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index ab5c953189c..e3c4aa4873a 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -48,9 +48,15 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
       group(:commit_id).count
 
+    json_merge_request = @merge_requests.as_json
+
     respond_to do |format|
       format.html
-      format.json { render json: @merge_request }
+      format.json do 
+        render json: {
+          hi: "yes"
+        }
+      end
       format.diff { render text: @merge_request.to_diff(current_user) }
       format.patch { render text: @merge_request.to_patch(current_user) }
     end
@@ -143,7 +149,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
         format.json do
           render json: {
             saved: @merge_request.valid?,
-            assignee_avatar_url: @merge_request.assignee.try(:avatar_url)
+            assignee_avatar_url: @merge_request.assignee.try(:avatar_url),
+            closed_event: @merge_request.closed_event
           }
         end
       end
@@ -154,8 +161,17 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
   def merge_check
     @merge_request.check_if_can_be_merged if @merge_request.unchecked?
-
-    render partial: "projects/merge_requests/widget/show.html.haml", layout: false
+    puts @merge_request.merge_status
+    respond_to do |format|
+      format.json do
+        render json: {
+          can_be_merged: @merge_request.merge_status == :can_be_merged
+        }
+      end
+      format.html do
+        render partial: "projects/merge_requests/widget/show.html.haml", layout: false
+      end
+    end
   end
 
   def cancel_merge_when_build_succeeds
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index fafe2acd538..6306450ca26 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -23,6 +23,15 @@ module MergeRequestsHelper
     return 'hidden' if mr.closed? == closed
   end
 
+  def merge_request_widget_visibility(mr, *states)
+    states.each do |state|
+      if mr.state == state
+        return
+      end
+    end
+    return 'hidden'
+  end
+
   def mr_css_classes(mr)
     classes = "merge-request"
     classes << " closed" if mr.closed?
diff --git a/app/views/projects/merge_requests/widget/_closed.html.haml b/app/views/projects/merge_requests/widget/_closed.html.haml
index f3cc0e7e8a1..46ee22ec873 100644
--- a/app/views/projects/merge_requests/widget/_closed.html.haml
+++ b/app/views/projects/merge_requests/widget/_closed.html.haml
@@ -1,4 +1,4 @@
-.mr-state-widget
+.mr-state-widget.mr-state-widget-closed{class: merge_request_widget_visibility(@merge_request, 'closed')}
   = render 'projects/merge_requests/widget/heading'
   .mr-widget-body
     %h4
diff --git a/app/views/projects/merge_requests/widget/_locked.html.haml b/app/views/projects/merge_requests/widget/_locked.html.haml
index 78d0783cba0..55ecd69a6ce 100644
--- a/app/views/projects/merge_requests/widget/_locked.html.haml
+++ b/app/views/projects/merge_requests/widget/_locked.html.haml
@@ -1,4 +1,4 @@
-.mr-state-widget
+.mr-state-widget.mr-state-widget-locked{class: merge_request_widget_visibility(@merge_request, 'locked')}
   = render 'projects/merge_requests/widget/heading'
   .mr-widget-body
     %h4
diff --git a/app/views/projects/merge_requests/widget/_merged.html.haml b/app/views/projects/merge_requests/widget/_merged.html.haml
index d1d602eecdc..2bb50967023 100644
--- a/app/views/projects/merge_requests/widget/_merged.html.haml
+++ b/app/views/projects/merge_requests/widget/_merged.html.haml
@@ -1,4 +1,4 @@
-.mr-state-widget
+.mr-state-widget.mr-state-widget-merged{class: merge_request_widget_visibility(@merge_request, 'merged')}
   = render 'projects/merge_requests/widget/heading'
   .mr-widget-body
     %h4
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml
index 55dbae598d3..2257a166460 100644
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@@ -1,24 +1,23 @@
-.mr-state-widget
+.mr-state-widget.mr-state-widget-opened{class: merge_request_widget_visibility(@merge_request, "opened","reopened")}
   = render 'projects/merge_requests/widget/heading'
-  .mr-widget-body
-    - if @project.archived?
-      = render 'projects/merge_requests/widget/open/archived'
-    - elsif @merge_request.commits.blank?
-      = render 'projects/merge_requests/widget/open/nothing'
-    - elsif @merge_request.branch_missing?
-      = render 'projects/merge_requests/widget/open/missing_branch'
-    - elsif @merge_request.unchecked?
-      = render 'projects/merge_requests/widget/open/check'
-    - elsif @merge_request.cannot_be_merged?
-      = render 'projects/merge_requests/widget/open/conflicts'
-    - elsif @merge_request.work_in_progress?
-      = render 'projects/merge_requests/widget/open/wip'
-    - elsif @merge_request.merge_when_build_succeeds?
-      = render 'projects/merge_requests/widget/open/merge_when_build_succeeds'
-    - elsif !@merge_request.can_be_merged_by?(current_user)
-      = render 'projects/merge_requests/widget/open/not_allowed'
-    - elsif @merge_request.can_be_merged?
-      = render 'projects/merge_requests/widget/open/accept'
+  .mr-widget-body.merge-request-archived{class: ("hidden" unless @project.archived?)}
+    = render 'projects/merge_requests/widget/open/archived'
+  .mr-widget-body.merge-request-blank{class: ("hidden" unless @merge_request.commits.blank?)}
+    = render 'projects/merge_requests/widget/open/nothing'
+  .mr-widget-body.merge-request-branch-missing{class: ("hidden" unless @merge_request.branch_missing?)}
+    = render 'projects/merge_requests/widget/open/missing_branch'
+  .mr-widget-body.merge-request-unchecked{class: ("hidden" unless @merge_request.unchecked?)}
+    = render 'projects/merge_requests/widget/open/check'
+  .mr-widget-body.merge-request-cannot-be-merged{class: ("hidden" unless @merge_request.cannot_be_merged?)}
+    = render 'projects/merge_requests/widget/open/conflicts'
+  .mr-widget-body.merge-request-work-in-progress{class: ("hidden" unless @merge_request.work_in_progress?)}
+    = render 'projects/merge_requests/widget/open/wip'
+  .mr-widget-body.merge-request-merge-when-build-succeeds{class: ("hidden" unless @merge_request.merge_when_build_succeeds?)}
+    = render 'projects/merge_requests/widget/open/merge_when_build_succeeds'
+  .mr-widget-body.not-allowed{class: ("hidden" if @merge_request.can_be_merged_by?(current_user))}
+    = render 'projects/merge_requests/widget/open/not_allowed'
+  .mr-widget-body.merge-request-archived.can-be-merged{class: ("hidden" unless @merge_request.can_be_merged?)}
+    = render 'projects/merge_requests/widget/open/accept'
 
   - if @closes_issues.present?
     .mr-widget-footer
diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml
index a489d4f9b24..d8f81dab067 100644
--- a/app/views/projects/merge_requests/widget/_show.html.haml
+++ b/app/views/projects/merge_requests/widget/_show.html.haml
@@ -1,17 +1,13 @@
-- if @merge_request.open?
-  = render 'projects/merge_requests/widget/open'
-- elsif @merge_request.merged?
-  = render 'projects/merge_requests/widget/merged'
-- elsif @merge_request.closed?
-  = render 'projects/merge_requests/widget/closed'
-- elsif @merge_request.locked?
-  = render 'projects/merge_requests/widget/locked'
+= render 'projects/merge_requests/widget/open'
+= render 'projects/merge_requests/widget/merged'
+= render 'projects/merge_requests/widget/closed'
+= render 'projects/merge_requests/widget/locked'
 
 :javascript
   var merge_request_widget;
 
   merge_request_widget = new MergeRequestWidget({
-    url_to_automerge_check: "#{merge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
+    url_to_automerge_check: "#{merge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request, format: :json)}",
     check_enable: #{@merge_request.unchecked? ? "true" : "false"},
     url_to_ci_check: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
     ci_enable: #{@project.ci_service ? "true" : "false"},
diff --git a/app/views/projects/merge_requests/widget/open/_archived.html.haml b/app/views/projects/merge_requests/widget/open/_archived.html.haml
index ab30fa6b243..0d61e56d8fb 100644
--- a/app/views/projects/merge_requests/widget/open/_archived.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_archived.html.haml
@@ -1,4 +1,4 @@
-%h4 
+%h4
   Project is archived
 %p
   This merge request cannot be merged because archived projects cannot be written to.
-- 
cgit v1.2.1


From 906de20f82f43dd81a82f56a689b1973a0c23080 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 12 Jan 2016 13:52:36 -0500
Subject: reverting _disscusion

---
 app/views/projects/merge_requests/_discussion.html.haml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml
index ed3628a36a3..bff3c3b283d 100644
--- a/app/views/projects/merge_requests/_discussion.html.haml
+++ b/app/views/projects/merge_requests/_discussion.html.haml
@@ -1,7 +1,8 @@
 - content_for :note_actions do
   - if can?(current_user, :update_merge_request, @merge_request)
-    = link_to 'Close', merge_request_path(@merge_request, merge_request: {state_event: :close}, format: 'json'), data: {no_turbolinks: true}, method: :put, class: "btn btn-nr btn-grouped btn-close close-mr-link btn-comment js-note-target-close #{merge_request_button_visibility(@merge_request, true)}", title: "Close merge request"
-    = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen}, format: 'json'),  data: {no_turbolinks: true}, method: :put, class: "btn btn-nr btn-grouped btn-reopen reopen-mr-link btn-comment js-note-target-reopen #{merge_request_button_visibility(@merge_request, false)}", title: "Reopen merge request"
+    - if @merge_request.open?
+      = link_to 'Close', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-nr btn-grouped btn-close close-mr-link js-note-target-close", title: "Close merge request"
+    - if @merge_request.closed?
+      = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request"
 
-#notes
-  = render "projects/notes/notes_with_form"
+#notes= render "projects/notes/notes_with_form"
-- 
cgit v1.2.1


From fa8b228f9dc391367e9cde8e90bff83dc6396434 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 12 Jan 2016 13:58:10 -0500
Subject: restores merge request coffee file

---
 app/assets/javascripts/merge_request.js.coffee | 49 --------------------------
 1 file changed, 49 deletions(-)

diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee
index c6c7f37707f..9047587db81 100644
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -22,7 +22,6 @@ class @MergeRequest
 
     if $("a.btn-close").length
       @initTaskList()
-      @initMergeRequestBtnEventListeners()
 
   # Local jQuery finder
   $: (selector) ->
@@ -36,54 +35,6 @@ class @MergeRequest
       # Show the first tab (Commits)
       $('.merge-request-tabs a[data-toggle="tab"]:first').tab('show')
 
-  initMergeRequestBtnEventListeners: ->
-    _this = @
-    mergeRequestFailMessage = 'Unable to update this merge request at this time.'
-    $('a.btn-close, a.btn-reopen').on 'click', (e) ->
-      e.preventDefault()
-      e.stopImmediatePropagation()
-      $this = $(this)
-      isClose = $this.hasClass('btn-close')
-      shouldSubmit = $this.hasClass('btn-comment')
-      if shouldSubmit
-        _this.submitNoteForm($this.closest('form'))
-      $this.prop('disabled', true)
-      url = $this.attr('href')
-      $.ajax
-        type: 'PUT',
-        url: url,
-        error: (jqXHR, textStatus, errorThrown) ->
-          mergeRequestStatus = if isClose then 'close' else 'open'
-          new Flash(mergeRequestFailMessage, 'alert')
-        success: (data, textStatus, jqXHR) ->
-          if data.saved
-            if isClose
-              $('a.btn-close').addClass('hidden')
-              $('a.issuable-edit').addClass('hidden')
-              $('a.btn-reopen').removeClass('hidden')
-              $('div.status-box-closed').removeClass('hidden')
-              $('div.status-box-open').addClass('hidden')
-
-              $('div.mr-state-widget-closed').removeClass('hidden')
-              $('div.mr-state-widget-opened').addClass('hidden')
-            else
-              $('a.btn-reopen').addClass('hidden')
-              $('a.issuable-edit').removeClass('hidden')
-              $('a.btn-close').removeClass('hidden')
-              $('div.status-box-closed').addClass('hidden')
-              $('div.status-box-open').removeClass('hidden')
-
-              $('div.mr-state-widget-closed').addClass('hidden')
-              $('div.mr-state-widget-opened').removeClass('hidden')
-          else
-            new Flash(mergeRequestFailMessage, 'alert')
-          $this.prop('disabled', false)
-
-  submitNoteForm: (form) =>
-    noteText = form.find("textarea.js-note-text").val()
-    if noteText.trim().length > 0
-      form.submit()
-
   showAllCommits: ->
     this.$('.first-commits').remove()
     this.$('.all-commits').removeClass 'hide'
-- 
cgit v1.2.1


From 7abfe14ee1d8fc81be102c35e449829586cec9f8 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 12 Jan 2016 14:35:55 -0500
Subject: reverting merge_request_controller

---
 app/controllers/projects/merge_requests_controller.rb | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index d85ef229254..de948d271c8 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -48,15 +48,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
       group(:commit_id).count
 
-    json_merge_request = @merge_requests.as_json
-
     respond_to do |format|
       format.html
-      format.json do 
-        render json: {
-          hi: "yes"
-        }
-      end
+      format.json { render json: @merge_request }
       format.diff { render text: @merge_request.to_diff(current_user) }
       format.patch { render text: @merge_request.to_patch(current_user) }
     end
@@ -149,8 +143,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
         format.json do
           render json: {
             saved: @merge_request.valid?,
-            assignee_avatar_url: @merge_request.assignee.try(:avatar_url),
-            closed_event: @merge_request.closed_event
+            assignee_avatar_url: @merge_request.assignee.try(:avatar_url)
           }
         end
       end
-- 
cgit v1.2.1


From aaf184bfa643d748cce42a4cf524642c6e77dc6e Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 12 Jan 2016 14:38:37 -0500
Subject: reverting _mr_title.html.haml

---
 .../merge_requests/show/_mr_title.html.haml        | 26 +++++++++-------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 7996d35c462..fc6fb2a0d42 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -1,12 +1,6 @@
 .detail-page-header
-  - if @merge_request.merged?
-    .status-box{ class: "status-box-merged" }
-      Merged
-  - else
-    .status-box{ class: "status-box-closed #{merge_request_button_visibility(@merge_request, false)}"}
-      Closed
-    .status-box{ class: "status-box-open #{merge_request_button_visibility(@merge_request, true)}"}
-      Open
+  .status-box{ class: status_box_class(@merge_request) }
+    = @merge_request.state_human_name
   %span.identifier
     Merge Request ##{@merge_request.iid}
   %span.creator
@@ -21,11 +15,11 @@
         = time_ago_with_tooltip(@merge_request.updated_at, placement: 'bottom')
 
   .issue-btn-group.pull-right
-    - if can?(current_user, :update_merge_request, @merge_request) && !@merge_request.merged?
-      
-      = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }, format: 'json'), data: {no_turbolink: true}, method: :put, class: "btn btn-nr btn-grouped btn-reopen reopen-mr-link #{merge_request_button_visibility(@merge_request, false)}", title: 'Reopen merge request'
-      = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }, format: 'json'), data: {no_turbolink: true}, method: :put, class: "btn btn-nr btn-grouped btn-close #{merge_request_button_visibility(@merge_request, true)}", title: 'Close merge request'
-
-      = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "btn btn-nr btn-grouped issuable-edit #{merge_request_button_visibility(@merge_request, true)}", id: 'edit_merge_request' do
-        %i.fa.fa-pencil-square-o
-        Edit
\ No newline at end of file
+    - if can?(current_user, :update_merge_request, @merge_request)
+      - if @merge_request.open?
+        = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: 'btn btn-nr btn-grouped btn-close', title: 'Close merge request'
+        = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-nr btn-grouped issuable-edit', id: 'edit_merge_request' do
+          %i.fa.fa-pencil-square-o
+          Edit
+      - if @merge_request.closed?
+        = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'btn btn-nr btn-grouped btn-reopen reopen-mr-link', title: 'Reopen merge request'
-- 
cgit v1.2.1


From e6f34237bc85f6347a895526179498c56c866970 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 12 Jan 2016 14:44:07 -0500
Subject: reverting MR ajax changes, which will be in a different MR

---
 app/assets/javascripts/merge_request_widget.js.coffee |  5 ++---
 app/helpers/merge_requests_helper.rb                  | 13 -------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index f0a687f79b1..738ffc8343b 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -28,9 +28,8 @@ class @MergeRequestWidget
 
   getMergeStatus: ->
     $.get @opts.url_to_automerge_check, (data) ->
-      console.log("data",data);
-      # $('div.mr-state-widget.mr-state-widget-opened').replaceWith(data)
-      
+      $('.mr-state-widget').replaceWith(data)
+
   getCiStatus: ->
     if @opts.ci_enable
       $.get @opts.url_to_ci_check, (data) =>
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 6306450ca26..1dd07a2a220 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -19,19 +19,6 @@ module MergeRequestsHelper
     }
   end
 
-  def merge_request_button_visibility(mr, closed)    
-    return 'hidden' if mr.closed? == closed
-  end
-
-  def merge_request_widget_visibility(mr, *states)
-    states.each do |state|
-      if mr.state == state
-        return
-      end
-    end
-    return 'hidden'
-  end
-
   def mr_css_classes(mr)
     classes = "merge-request"
     classes << " closed" if mr.closed?
-- 
cgit v1.2.1


From 63363e47f4228e15585b0908d91c8749b1067d37 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 12 Jan 2016 14:55:54 -0500
Subject: reverting more MR ajax files, will appear in different commit

---
 .../projects/merge_requests/widget/_open.html.haml | 39 +++++-----
 .../projects/merge_requests/widget/_show.html.haml | 14 ++--
 .../merge_requests/widget/open/_archived.html.haml |  2 +-
 .../fixtures/merge_requests_show.html.haml         | 12 +--
 spec/javascripts/merge_request_spec.js.coffee      | 88 ----------------------
 5 files changed, 31 insertions(+), 124 deletions(-)

diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml
index 2257a166460..55dbae598d3 100644
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@@ -1,23 +1,24 @@
-.mr-state-widget.mr-state-widget-opened{class: merge_request_widget_visibility(@merge_request, "opened","reopened")}
+.mr-state-widget
   = render 'projects/merge_requests/widget/heading'
-  .mr-widget-body.merge-request-archived{class: ("hidden" unless @project.archived?)}
-    = render 'projects/merge_requests/widget/open/archived'
-  .mr-widget-body.merge-request-blank{class: ("hidden" unless @merge_request.commits.blank?)}
-    = render 'projects/merge_requests/widget/open/nothing'
-  .mr-widget-body.merge-request-branch-missing{class: ("hidden" unless @merge_request.branch_missing?)}
-    = render 'projects/merge_requests/widget/open/missing_branch'
-  .mr-widget-body.merge-request-unchecked{class: ("hidden" unless @merge_request.unchecked?)}
-    = render 'projects/merge_requests/widget/open/check'
-  .mr-widget-body.merge-request-cannot-be-merged{class: ("hidden" unless @merge_request.cannot_be_merged?)}
-    = render 'projects/merge_requests/widget/open/conflicts'
-  .mr-widget-body.merge-request-work-in-progress{class: ("hidden" unless @merge_request.work_in_progress?)}
-    = render 'projects/merge_requests/widget/open/wip'
-  .mr-widget-body.merge-request-merge-when-build-succeeds{class: ("hidden" unless @merge_request.merge_when_build_succeeds?)}
-    = render 'projects/merge_requests/widget/open/merge_when_build_succeeds'
-  .mr-widget-body.not-allowed{class: ("hidden" if @merge_request.can_be_merged_by?(current_user))}
-    = render 'projects/merge_requests/widget/open/not_allowed'
-  .mr-widget-body.merge-request-archived.can-be-merged{class: ("hidden" unless @merge_request.can_be_merged?)}
-    = render 'projects/merge_requests/widget/open/accept'
+  .mr-widget-body
+    - if @project.archived?
+      = render 'projects/merge_requests/widget/open/archived'
+    - elsif @merge_request.commits.blank?
+      = render 'projects/merge_requests/widget/open/nothing'
+    - elsif @merge_request.branch_missing?
+      = render 'projects/merge_requests/widget/open/missing_branch'
+    - elsif @merge_request.unchecked?
+      = render 'projects/merge_requests/widget/open/check'
+    - elsif @merge_request.cannot_be_merged?
+      = render 'projects/merge_requests/widget/open/conflicts'
+    - elsif @merge_request.work_in_progress?
+      = render 'projects/merge_requests/widget/open/wip'
+    - elsif @merge_request.merge_when_build_succeeds?
+      = render 'projects/merge_requests/widget/open/merge_when_build_succeeds'
+    - elsif !@merge_request.can_be_merged_by?(current_user)
+      = render 'projects/merge_requests/widget/open/not_allowed'
+    - elsif @merge_request.can_be_merged?
+      = render 'projects/merge_requests/widget/open/accept'
 
   - if @closes_issues.present?
     .mr-widget-footer
diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml
index d8f81dab067..a489d4f9b24 100644
--- a/app/views/projects/merge_requests/widget/_show.html.haml
+++ b/app/views/projects/merge_requests/widget/_show.html.haml
@@ -1,13 +1,17 @@
-= render 'projects/merge_requests/widget/open'
-= render 'projects/merge_requests/widget/merged'
-= render 'projects/merge_requests/widget/closed'
-= render 'projects/merge_requests/widget/locked'
+- if @merge_request.open?
+  = render 'projects/merge_requests/widget/open'
+- elsif @merge_request.merged?
+  = render 'projects/merge_requests/widget/merged'
+- elsif @merge_request.closed?
+  = render 'projects/merge_requests/widget/closed'
+- elsif @merge_request.locked?
+  = render 'projects/merge_requests/widget/locked'
 
 :javascript
   var merge_request_widget;
 
   merge_request_widget = new MergeRequestWidget({
-    url_to_automerge_check: "#{merge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request, format: :json)}",
+    url_to_automerge_check: "#{merge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
     check_enable: #{@merge_request.unchecked? ? "true" : "false"},
     url_to_ci_check: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
     ci_enable: #{@project.ci_service ? "true" : "false"},
diff --git a/app/views/projects/merge_requests/widget/open/_archived.html.haml b/app/views/projects/merge_requests/widget/open/_archived.html.haml
index 0d61e56d8fb..ab30fa6b243 100644
--- a/app/views/projects/merge_requests/widget/open/_archived.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_archived.html.haml
@@ -1,4 +1,4 @@
-%h4
+%h4 
   Project is archived
 %p
   This merge request cannot be merged because archived projects cannot be written to.
diff --git a/spec/javascripts/fixtures/merge_requests_show.html.haml b/spec/javascripts/fixtures/merge_requests_show.html.haml
index fdfa8a273e2..8447dfdda32 100644
--- a/spec/javascripts/fixtures/merge_requests_show.html.haml
+++ b/spec/javascripts/fixtures/merge_requests_show.html.haml
@@ -1,14 +1,4 @@
-:css
-  .hidden { display: none !important }
-
-.flash-container
-  .flash-alert
-  .flash-notice
-
-.status-box.status-box-open Open
-.status-box.status-box-closed.hidden Closed
-%a.btn-close{"href" => "http://gitlab.com/merge_requests/6/close"} Close
-%a.btn-reopen.hidden{"href" => "http://gitlab.com/merge_requests/6/reopen"} Reopen
+%a.btn-close
 
 .detail-page-description
   .description.js-task-list-container
diff --git a/spec/javascripts/merge_request_spec.js.coffee b/spec/javascripts/merge_request_spec.js.coffee
index e21bfde38ad..22ebc7039d1 100644
--- a/spec/javascripts/merge_request_spec.js.coffee
+++ b/spec/javascripts/merge_request_spec.js.coffee
@@ -21,91 +21,3 @@ describe 'MergeRequest', ->
         expect(req.data.merge_request.description).not.toBe(null)
 
       $('.js-task-list-field').trigger('tasklist:changed')
-
-  describe 'reopen/close merge request', ->
-    fixture.preload('merge_requests_show.html')
-    beforeEach ->
-      fixture.load('merge_requests_show.html')
-      @merge_request = new MergeRequest({})
-    it 'closes a merge request', ->
-      $.ajax = (obj) ->
-        expect(obj.type).toBe('PUT')
-        expect(obj.url).toBe('http://gitlab.com/merge_requests/6/close')
-        obj.success saved:true
-
-      $btnClose = $('a.btn-close')
-      $btnReopen = $('a.btn-reopen')
-      expect($btnReopen).toBeHidden()
-      expect($btnClose.text()).toBe('Close')
-      expect(typeof $btnClose.prop('disabled')).toBe('undefined')
-
-      $btnClose.trigger('click')
-
-      expect($btnReopen).toBeVisible()
-
-      expect($btnClose).toBeHidden()
-      expect($('div.status-box-closed')).toBeVisible()
-      expect($('div.status-box-open')).toBeHidden()
-
-    it 'fails to close a merge request with success:false', ->
-
-      $.ajax = (obj) ->
-        expect(obj.type).toBe('PUT')
-        expect(obj.url).toBe('http://goesnowhere.nothing/whereami')
-        obj.success saved:false
-
-      $btnClose = $('a.btn-close')
-      $btnReopen = $('a.btn-reopen')
-      $btnClose.attr('href','http://goesnowhere.nothing/whereami')
-      expect($btnReopen).toBeHidden()
-      expect($btnClose.text()).toBe('Close')
-      expect(typeof $btnClose.prop('disabled')).toBe('undefined')
-
-      $btnClose.trigger('click')
-
-      expect($btnReopen).toBeHidden()
-      expect($btnClose).toBeVisible()
-      expect($('div.status-box-closed')).toBeHidden()
-      expect($('div.status-box-open')).toBeVisible()
-      expect($('div.flash-alert')).toBeVisible()
-      expect($('div.flash-alert').text()).toBe('Unable to update this merge request at this time.')
-
-    it 'fails to closes an issue with HTTP error', ->
-
-      $.ajax = (obj) ->
-        expect(obj.type).toBe('PUT')
-        expect(obj.url).toBe('http://goesnowhere.nothing/whereami')
-        obj.error()
-      
-      $btnClose = $('a.btn-close')
-      $btnReopen = $('a.btn-reopen')
-      $btnClose.attr('href','http://goesnowhere.nothing/whereami')
-      expect($btnReopen).toBeHidden()
-      expect($btnClose.text()).toBe('Close')
-      expect(typeof $btnClose.prop('disabled')).toBe('undefined')
-
-      $btnClose.trigger('click')
-      
-      expect($btnReopen).toBeHidden()
-      expect($btnClose).toBeVisible()
-      expect($('div.status-box-closed')).toBeHidden()
-      expect($('div.status-box-open')).toBeVisible()
-      expect($('div.flash-alert')).toBeVisible()
-      expect($('div.flash-alert').text()).toBe('Unable to update this merge request at this time.')    
-    
-    it 'reopens a merge request', ->
-      $.ajax = (obj) ->
-        expect(obj.type).toBe('PUT')
-        expect(obj.url).toBe('http://gitlab.com/merge_requests/6/reopen')
-        obj.success saved: true
-
-      $btnClose = $('a.btn-close')
-      $btnReopen = $('a.btn-reopen')
-      expect($btnReopen.text()).toBe('Reopen')
-
-      $btnReopen.trigger('click')
-
-      expect($btnReopen).toBeHidden()
-      expect($btnClose).toBeVisible()
-      expect($('div.status-box-open')).toBeVisible()
-      expect($('div.status-box-closed')).toBeHidden()
\ No newline at end of file
-- 
cgit v1.2.1


From c0220198d1fc880a092134a07901c52be4b3595b Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 12 Jan 2016 15:16:26 -0500
Subject: removing last chunk of MR ajax changes, rest will be in another MR

---
 app/models/merge_request.rb                                | 10 ++++++++++
 app/views/projects/issues/_discussion.html.haml            |  6 ++++--
 app/views/projects/merge_requests/widget/_closed.html.haml |  2 +-
 app/views/projects/merge_requests/widget/_locked.html.haml |  2 +-
 app/views/projects/merge_requests/widget/_merged.html.haml |  2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b2cb86dc1e5..c63d0c01653 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -466,6 +466,16 @@ class MergeRequest < ActiveRecord::Base
     ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
   end
 
+  def state_human_name
+    if merged?
+      "Merged"
+    elsif closed?
+      "Closed"
+    else
+      "Open"
+    end
+  end
+
   def target_sha
     @target_sha ||= target_project.
       repository.commit(target_branch).sha
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml
index 673020a4e30..dc434cf38c4 100644
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
@@ -1,7 +1,9 @@
 - content_for :note_actions do
   - if can?(current_user, :update_issue, @issue)
-    = link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "btn btn-nr btn-grouped btn-reopen btn-comment js-note-target-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen Issue'
-    = link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close}, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "btn btn-nr btn-grouped btn-close btn-comment js-note-target-close #{issue_button_visibility(@issue, true)}", title: 'Close Issue'
+    - if @issue.closed?
+      = link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true), method: :put, class: 'btn btn-nr btn-grouped btn-reopen js-note-target-reopen', title: 'Reopen Issue'
+    - else
+      = link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close}, status_only: true), method: :put, class: 'btn btn-nr btn-grouped btn-close js-note-target-close', title: 'Close Issue'
 
 #notes
   = render 'projects/notes/notes_with_form'
diff --git a/app/views/projects/merge_requests/widget/_closed.html.haml b/app/views/projects/merge_requests/widget/_closed.html.haml
index 46ee22ec873..f3cc0e7e8a1 100644
--- a/app/views/projects/merge_requests/widget/_closed.html.haml
+++ b/app/views/projects/merge_requests/widget/_closed.html.haml
@@ -1,4 +1,4 @@
-.mr-state-widget.mr-state-widget-closed{class: merge_request_widget_visibility(@merge_request, 'closed')}
+.mr-state-widget
   = render 'projects/merge_requests/widget/heading'
   .mr-widget-body
     %h4
diff --git a/app/views/projects/merge_requests/widget/_locked.html.haml b/app/views/projects/merge_requests/widget/_locked.html.haml
index 55ecd69a6ce..78d0783cba0 100644
--- a/app/views/projects/merge_requests/widget/_locked.html.haml
+++ b/app/views/projects/merge_requests/widget/_locked.html.haml
@@ -1,4 +1,4 @@
-.mr-state-widget.mr-state-widget-locked{class: merge_request_widget_visibility(@merge_request, 'locked')}
+.mr-state-widget
   = render 'projects/merge_requests/widget/heading'
   .mr-widget-body
     %h4
diff --git a/app/views/projects/merge_requests/widget/_merged.html.haml b/app/views/projects/merge_requests/widget/_merged.html.haml
index 2bb50967023..d1d602eecdc 100644
--- a/app/views/projects/merge_requests/widget/_merged.html.haml
+++ b/app/views/projects/merge_requests/widget/_merged.html.haml
@@ -1,4 +1,4 @@
-.mr-state-widget.mr-state-widget-merged{class: merge_request_widget_visibility(@merge_request, 'merged')}
+.mr-state-widget
   = render 'projects/merge_requests/widget/heading'
   .mr-widget-body
     %h4
-- 
cgit v1.2.1


From d82d3ecd488a04eacaf7bb0de6d3091cdceaf0a7 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 12 Jan 2016 15:45:48 -0500
Subject: adds back in discussion.haml.html for issues commenting and
 closing/reopening properly.

---
 app/assets/javascripts/issue.js.coffee          | 2 ++
 app/views/projects/issues/_discussion.html.haml | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee
index 0d26c58a81d..8ecd0f36339 100644
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -33,6 +33,7 @@ class @Issue
         url: url,
         error: (jqXHR, textStatus, errorThrown) ->
           issueStatus = if isClose then 'close' else 'open'
+          console.log('failed here')
           new Flash(issueFailMessage, 'alert')
         success: (data, textStatus, jqXHR) ->
           if data.saved
@@ -47,6 +48,7 @@ class @Issue
               $('div.status-box-closed').addClass('hidden')
               $('div.status-box-open').removeClass('hidden')
           else
+            console.log('failed there')
             new Flash(issueFailMessage, 'alert')
           $this.prop('disabled', false)
 
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml
index dc434cf38c4..673020a4e30 100644
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
@@ -1,9 +1,7 @@
 - content_for :note_actions do
   - if can?(current_user, :update_issue, @issue)
-    - if @issue.closed?
-      = link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true), method: :put, class: 'btn btn-nr btn-grouped btn-reopen js-note-target-reopen', title: 'Reopen Issue'
-    - else
-      = link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close}, status_only: true), method: :put, class: 'btn btn-nr btn-grouped btn-close js-note-target-close', title: 'Close Issue'
+    = link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "btn btn-nr btn-grouped btn-reopen btn-comment js-note-target-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen Issue'
+    = link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close}, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "btn btn-nr btn-grouped btn-close btn-comment js-note-target-close #{issue_button_visibility(@issue, true)}", title: 'Close Issue'
 
 #notes
   = render 'projects/notes/notes_with_form'
-- 
cgit v1.2.1


From f01d0520713a2b5cb58511cdda10d459941ac8e9 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 12 Jan 2016 16:29:14 -0500
Subject: gets merge request discussion working again

---
 app/assets/javascripts/issue.js.coffee             |  2 --
 app/assets/javascripts/merge_request.js.coffee     | 22 ++++++++++++++++++++++
 .../projects/merge_requests/_discussion.html.haml  |  4 ++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee
index 8ecd0f36339..0d26c58a81d 100644
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -33,7 +33,6 @@ class @Issue
         url: url,
         error: (jqXHR, textStatus, errorThrown) ->
           issueStatus = if isClose then 'close' else 'open'
-          console.log('failed here')
           new Flash(issueFailMessage, 'alert')
         success: (data, textStatus, jqXHR) ->
           if data.saved
@@ -48,7 +47,6 @@ class @Issue
               $('div.status-box-closed').addClass('hidden')
               $('div.status-box-open').removeClass('hidden')
           else
-            console.log('failed there')
             new Flash(issueFailMessage, 'alert')
           $this.prop('disabled', false)
 
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee
index 9047587db81..ed0bf2b3f48 100644
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -19,6 +19,7 @@ class @MergeRequest
 
     # Prevent duplicate event bindings
     @disableTaskList()
+    @initMRBtnListeners()
 
     if $("a.btn-close").length
       @initTaskList()
@@ -43,6 +44,27 @@ class @MergeRequest
     $('.detail-page-description .js-task-list-container').taskList('enable')
     $(document).on 'tasklist:changed', '.detail-page-description .js-task-list-container', @updateTaskList
 
+  initMRBtnListeners: ->
+    _this = @
+    $('a.btn-close, a.btn-reopen').on 'click', (e) ->
+      $this = $(this)
+      if $this.data('submitted')
+        return
+      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
+      form.submit()
+      $button.data('submitted',true)
+      $button.trigger('click')
+
+
   disableTaskList: ->
     $('.detail-page-description .js-task-list-container').taskList('disable')
     $(document).off 'tasklist:changed', '.detail-page-description .js-task-list-container'
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml
index bff3c3b283d..1c7de94acfd 100644
--- a/app/views/projects/merge_requests/_discussion.html.haml
+++ b/app/views/projects/merge_requests/_discussion.html.haml
@@ -1,8 +1,8 @@
 - content_for :note_actions do
   - if can?(current_user, :update_merge_request, @merge_request)
     - if @merge_request.open?
-      = link_to 'Close', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-nr btn-grouped btn-close close-mr-link js-note-target-close", title: "Close merge request"
+      = link_to 'Close', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-nr btn-comment btn-grouped btn-close close-mr-link js-note-target-close", title: "Close merge request"
     - if @merge_request.closed?
-      = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request"
+      = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-comment btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request"
 
 #notes= render "projects/notes/notes_with_form"
-- 
cgit v1.2.1