X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=app%2Fassets%2Fjavascripts%2Fmerge_requests.js;h=239ea85c070b90880c163f0b22037d5f7610bed2;hb=08994f3f6034eb214de4cda304d8797a51b2397a;hp=132a05739d9e221defefdea2ca4b2f597d9ad495;hpb=3a6694b5516f4c5015a7745cf8182e74597b39ad;p=wvm%2Fgitlab.git diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js index 132a05739..239ea85c0 100644 --- 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: