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

use refresh icon instead loader gif

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-14 14:02:24 +02:00
parent 88d42c2e1c
commit a8b1f8c0e5
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,8 @@
.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"
.merge-in-progress.1hide
%span.cgray
%i.icon-refresh.icon-spin
 
Merge is in progress. Please wait. Page will be automatically reloaded.