Merge pull request #9043 from skburgart/fix/merge-wording

Change merging notification to sound more natural

Merge pull request #9043 from skburgart/fix/merge-wording
Change merging notification to sound more natural
db948ff3 · Robert Schilling · 6664da43 · 83064492 · db948ff3
Commit db948ff3 authored Mar 28, 2015 by Robert Schilling
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/views/projects/merge_requests/show/_state_widget.html.haml ...iews/projects/merge_requests/show/_state_widget.html.haml +1 -1

No files found.
--- 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