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

Auto-merge: 'already can not be merged' alert

Browse source
This commit is contained in:
Valery Sizov 2012-04-16 23:05:08 +03:00
parent 8269a3a735
commit a8e4f3ed88
4 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ var MergeRequest = {
function(opts) {
this.opts = opts;
if($(".automerge_widget").lenght){
if($(".automerge_widget").length){
$.get(opts.url_to_automerge_check, function(data){
$(".automerge_widget").hide();
$(".automerge_widget." + data.state).show();
@ -48,5 +48,11 @@ var MergeRequest = {
$('.status').removeClass("loading");
},
dataType: "script"});
},
already_cannot_be_merged:
function(){
$(".automerge_widget").hide();
$(".automerge_widget.already_cannot_be_merged").show();
}
}