diff options
| -rw-r--r-- | app/assets/javascripts/merge_requests.js | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 5 | ||||
| -rw-r--r-- | app/views/merge_requests/_show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/merge_requests/show/_mr_accept.html.haml | 3 |
4 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js index 4b1551927c5..0ab6f6e22a1 100644 --- a/app/assets/javascripts/merge_requests.js +++ b/app/assets/javascripts/merge_requests.js @@ -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(); } } diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 34f43acf839..ec84a64e23a 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -94,3 +94,8 @@ li.merge_request { padding-bottom: 2px; } } + +.merge_in_progress { + @extend .padded; + @extend .append-bottom-10; +} diff --git a/app/views/merge_requests/_show.html.haml b/app/views/merge_requests/_show.html.haml index 072bf259f46..f1b3fa9fe98 100644 --- a/app/views/merge_requests/_show.html.haml +++ b/app/views/merge_requests/_show.html.haml @@ -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(); }) }) diff --git a/app/views/merge_requests/show/_mr_accept.html.haml b/app/views/merge_requests/show/_mr_accept.html.haml index efd47af0cda..f24228856ff 100644 --- a/app/views/merge_requests/show/_mr_accept.html.haml +++ b/app/views/merge_requests/show/_mr_accept.html.haml @@ -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" |