deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/merge_button'

Browse source 
Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb
This commit is contained in:
Dmitriy Zaporozhets 2012-04-21 12:22:56 +03:00
commit 08994f3f60
13 changed files with 223 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/assets/javascripts/merge_requests.js
View file

@ -1,9 +1,19 @@
var MergeRequest = {
diffs_loaded: false,
commits_loaded: false,
opts: false,
init:
function() {
function(opts) {
this.opts = opts;
if($(".automerge_widget").length){
$.get(opts.url_to_automerge_check, function(data){
$(".automerge_widget").hide();
$(".automerge_widget." + data.state).show();
}, "json");
}
$(".nav-tabs a").live("click", function() {
$(".nav-tabs a").parent().removeClass("active");
$(this).parent().addClass("active");
@ -44,5 +54,11 @@ var MergeRequest = {
function() {
$(".first_mr_commits").remove();
$(".all_mr_commits").removeClass("hide");
},
already_cannot_be_merged:
function(){
$(".automerge_widget").hide();
$(".automerge_widget.already_cannot_be_merged").show();
}
}