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

Text message for mergeing MR

Browse source
This commit is contained in:
randx 2012-08-19 00:45:46 +03:00
parent 7530fa9dec
commit 8eaead6a01
4 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -112,6 +112,7 @@ var MergeRequest = {
already_cannot_be_merged: already_cannot_be_merged:
function(){ function(){
$(".automerge_widget").hide(); $(".automerge_widget").hide();
$(".merge_in_progress").hide();
$(".automerge_widget.already_cannot_be_merged").show(); $(".automerge_widget.already_cannot_be_merged").show();
} }
} }

5
app/assets/stylesheets/sections/merge_requests.scss
View file

@ -94,3 +94,8 @@ li.merge_request {
padding-bottom: 2px; padding-bottom: 2px;
} }
} }
.merge_in_progress {
@extend .padded;
@extend .append-bottom-10;
}

3
app/views/merge_requests/_show.html.haml
View file

@ -33,7 +33,8 @@
}); });
$(".edit_merge_request").live("ajax:beforeSend", function() { $(".edit_merge_request").live("ajax:beforeSend", function() {
$(this).replaceWith('#{image_tag "ajax_loader.gif"}'); $('.can_be_merged').hide();
$('.merge_in_progress').show();
}) })
}) })

3
app/views/merge_requests/show/_mr_accept.html.haml
View file

@ -40,3 +40,6 @@
.alert.alert-info .alert.alert-info
%strong This merge request already can not be merged. Try to reload page. %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"