From a8b1f8c0e5307ea71a2ba4790485cab3c4691d30 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 14 Mar 2013 14:02:24 +0200 Subject: [PATCH] use refresh icon instead loader gif --- app/views/merge_requests/show/_mr_accept.html.haml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/merge_requests/show/_mr_accept.html.haml b/app/views/merge_requests/show/_mr_accept.html.haml index d4271c55..ece48b81 100644 --- 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 - %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.