use refresh icon instead loader gif

a8b1f8c0 · Dmitriy Zaporozhets · 88d42c2e · a8b1f8c0
Commit a8b1f8c0 authored Mar 14, 2013 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

app/views/merge_requests/show/_mr_accept.html.haml app/views/merge_requests/show/_mr_accept.html.haml +5 -3

No files found.
--- a/app/views/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/merge_requests/show/_mr_accept.html.haml
@@ -45,6 +45,8 @@
    .alert.alert-info
      %strong This merge request already can not be merged. Try to reload page.
-  .merge-in-progress.hide
+  .merge-in-progress.1hide
-    %span.cgray Merge is in progress. Please wait. Page will be automatically reloaded. &nbsp;
+    %span.cgray
-    = image_tag "ajax_loader.gif"
+      %i.icon-refresh.icon-spin
+      &nbsp;
+      Merge is in progress. Please wait. Page will be automatically reloaded. &nbsp;