summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/widget/_locked.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/projects/merge_requests/widget/_locked.html.haml')
-rw-r--r--app/views/projects/merge_requests/widget/_locked.html.haml5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/widget/_locked.html.haml b/app/views/projects/merge_requests/widget/_locked.html.haml
index 13ec278847b..78d0783cba0 100644
--- a/app/views/projects/merge_requests/widget/_locked.html.haml
+++ b/app/views/projects/merge_requests/widget/_locked.html.haml
@@ -2,7 +2,8 @@
= render 'projects/merge_requests/widget/heading'
.mr-widget-body
%h4
- Merge in progress...
+ = icon("spinner spin")
+ Merge in progress…
%p
- Merging is in progress. While merging this request is locked and cannot be closed.
+ This merge request is in the process of being merged, during which time it is locked and cannot be closed.