Commit 8eaead6a authored by randx's avatar randx

Text message for mergeing MR

parent 7530fa9d
......@@ -112,6 +112,7 @@ var MergeRequest = {
already_cannot_be_merged:
function(){
$(".automerge_widget").hide();
$(".merge_in_progress").hide();
$(".automerge_widget.already_cannot_be_merged").show();
}
}
......@@ -94,3 +94,8 @@ li.merge_request {
padding-bottom: 2px;
}
}
.merge_in_progress {
@extend .padded;
@extend .append-bottom-10;
}
......@@ -33,7 +33,8 @@
});
$(".edit_merge_request").live("ajax:beforeSend", function() {
$(this).replaceWith('#{image_tag "ajax_loader.gif"}');
$('.can_be_merged').hide();
$('.merge_in_progress').show();
})
})
......@@ -40,3 +40,6 @@
.alert.alert-info
%strong This merge request already can not be merged. Try to reload page.
.merge_in_progress.hide
%span.cgray Merge is in progress. Please wait. Page will be automatically reloaded.  
= image_tag "ajax_loader.gif"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment