From 83064492a0281f44f4e3e5726a9a92183c06330a Mon Sep 17 00:00:00 2001 From: Steven Burgart Date: Fri, 27 Mar 2015 15:50:54 -0400 Subject: [PATCH] Change merging notification to sound more natural --- app/views/projects/merge_requests/show/_state_widget.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/merge_requests/show/_state_widget.html.haml b/app/views/projects/merge_requests/show/_state_widget.html.haml index a4f2a890969..44bd9347f51 100644 --- a/app/views/projects/merge_requests/show/_state_widget.html.haml +++ b/app/views/projects/merge_requests/show/_state_widget.html.haml @@ -29,7 +29,7 @@ %h4 Merge in progress... %p - GitLab tries to merge it right now. During this time merge request is locked and can not be closed. + Merging is in progress. While merging this request is locked and cannot be closed. - unless @commits.any? %h4 Nothing to merge