Task #735 Automerge should not be checked on every load of MR show page

2 files changed, 14 insertions, 4 deletions

diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js
index 239ea85c070..c075cb4c0a3 100644
--- a/app/assets/javascripts/merge_requests.js
+++ b/app/assets/javascripts/merge_requests.js
@@ -5,12 +5,13 @@ var MergeRequest = {
 
   init:
     function(opts) {
-      this.opts = opts;
+      var self = this;
+      self.opts = opts;
 
-      if($(".automerge_widget").length){
+      self.showState(self.opts.current_state);
+      if($(".automerge_widget").length && self.opts.check_enable){
         $.get(opts.url_to_automerge_check, function(data){
-          $(".automerge_widget").hide();
-          $(".automerge_widget." + data.state).show();
+          self.showState(data.state);
         }, "json");
       }
 
@@ -35,6 +36,13 @@ var MergeRequest = {
       });
     },
 
+  showState:
+    function(state){
+      $(".automerge_widget").hide();
+      $(".automerge_widget." + state).show();
+    },
+
+
   loadDiff:
     function() { 
       $(".dashboard-loader").show();
diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml
index 56345c394c8..6c57103a8b4 100644
--- a/app/views/merge_requests/show.html.haml
+++ b/app/views/merge_requests/show.html.haml
@@ -101,6 +101,8 @@
   $(function(){
     MergeRequest.init({
       url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
+      check_enable: #{@merge_request.state == MergeRequest::UNCHECKED ? "true" : "false"},
+      current_state: "#{@merge_request.human_state}"
     });
 
     $(".accept_merge_request").live("ajax:beforeSend", function() {