Download as
Browse Code »

Commit 8eaead6a01739fee37d7b29b78decc2e8a4b89a3

Authored by randx
1 parent 7530fa9d
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Text message for mergeing MR

Showing 4 changed files with 11 additions and 1 deletions   Show diff stats
app/assets/javascripts/merge_requests.js
  Diff comments   View file @8eaead6
@@ -112,6 +112,7 @@ var MergeRequest = { @@ -112,6 +112,7 @@ var MergeRequest = {
112 already_cannot_be_merged: 112 already_cannot_be_merged:
113 function(){ 113 function(){
114 $(".automerge_widget").hide(); 114 $(".automerge_widget").hide();
  115 + $(".merge_in_progress").hide();
115 $(".automerge_widget.already_cannot_be_merged").show(); 116 $(".automerge_widget.already_cannot_be_merged").show();
116 } 117 }
117 } 118 }
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @8eaead6
@@ -94,3 +94,8 @@ li.merge_request { @@ -94,3 +94,8 @@ li.merge_request {
94 padding-bottom: 2px; 94 padding-bottom: 2px;
95 } 95 }
96 } 96 }
  97 +
  98 +.merge_in_progress {
  99 + @extend .padded;
  100 + @extend .append-bottom-10;
  101 +}
app/views/merge_requests/_show.html.haml
  Diff comments   View file @8eaead6
@@ -33,7 +33,8 @@ @@ -33,7 +33,8 @@
33 }); 33 });
34 34
35 $(".edit_merge_request").live("ajax:beforeSend", function() { 35 $(".edit_merge_request").live("ajax:beforeSend", function() {
36 - $(this).replaceWith('#{image_tag "ajax_loader.gif"}'); 36 + $('.can_be_merged').hide();
  37 + $('.merge_in_progress').show();
37 }) 38 })
38 }) 39 })
39 40
app/views/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @8eaead6
@@ -40,3 +40,6 @@ @@ -40,3 +40,6 @@
40 .alert.alert-info 40 .alert.alert-info
41 %strong This merge request already can not be merged. Try to reload page. 41 %strong This merge request already can not be merged. Try to reload page.
42 42
  43 + .merge_in_progress.hide
  44 + %span.cgray Merge is in progress. Please wait. Page will be automatically reloaded.  
  45 + = image_tag "ajax_loader.gif"