Merge remote-tracking branch 'origin/merge_button'

[wvm/gitlab.git] / app / assets / javascripts / merge_requests.js

diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js
index 132a057..239ea85 100644 (file)
--- a/app/assets/javascripts/merge_requests.js
+++ b/app/assets/javascripts/merge_requests.js
@@ -14,18 +14,18 @@ var MergeRequest = {
         }, "json");
       }
 
-      $(".tabs a").live("click", function() { 
-        $(".tabs a").parent().removeClass("active");
+      $(".nav-tabs a").live("click", function() { 
+        $(".nav-tabs a").parent().removeClass("active");
         $(this).parent().addClass("active");
       });
 
-      $(".tabs a.merge-notes-tab").live("click", function(e) { 
+      $(".nav-tabs a.merge-notes-tab").live("click", function(e) { 
         $(".merge-request-diffs").hide();
         $(".merge_request_notes").show();
         e.preventDefault();
       });
 
-      $(".tabs a.merge-diffs-tab").live("click", function(e) { 
+      $(".nav-tabs a.merge-diffs-tab").live("click", function(e) { 
         if(!MergeRequest.diffs_loaded) { 
           MergeRequest.loadDiff(); 
         }
@@ -48,6 +48,12 @@ var MergeRequest = {
           $('.status').removeClass("loading");
         },
         dataType: "script"});
+    }, 
+
+  showAllCommits: 
+    function() { 
+      $(".first_mr_commits").remove();
+      $(".all_mr_commits").removeClass("hide");
     },
 
   already_cannot_be_merged: