Change merging notification to sound more natural

2015-03-27 15:50:54 -04:00 · 2015-03-27 15:50:54 -04:00 · 83064492a0
parent 3d4c2d0b51
commit 83064492a0
1 changed files with 1 additions and 1 deletions
--- 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