Commit a8b1f8c0e5307ea71a2ba4790485cab3c4691d30
1 parent
88d42c2e
Exists in
master
and in
4 other branches
use refresh icon instead loader gif
Showing
1 changed file
with
5 additions
and
3 deletions
Show diff stats
app/views/merge_requests/show/_mr_accept.html.haml
| @@ -45,6 +45,8 @@ | @@ -45,6 +45,8 @@ | ||
| 45 | .alert.alert-info | 45 | .alert.alert-info |
| 46 | %strong This merge request already can not be merged. Try to reload page. | 46 | %strong This merge request already can not be merged. Try to reload page. |
| 47 | 47 | ||
| 48 | - .merge-in-progress.hide | ||
| 49 | - %span.cgray Merge is in progress. Please wait. Page will be automatically reloaded. | ||
| 50 | - = image_tag "ajax_loader.gif" | 48 | + .merge-in-progress.1hide |
| 49 | + %span.cgray | ||
| 50 | + %i.icon-refresh.icon-spin | ||
| 51 | + | ||
| 52 | + Merge is in progress. Please wait. Page will be automatically reloaded. |