diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2015-03-28 09:37:18 +0100 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-03-28 09:37:18 +0100 |
| commit | db948ff3d6a72620391c7cb0f169334cef0438c7 (patch) | |
| tree | 1bb97a91ba692ca33700590eba7fb1bde783e3a7 | |
| parent | 6664da431aaa9f9a521323004420bcf700af4306 (diff) | |
| parent | 83064492a0281f44f4e3e5726a9a92183c06330a (diff) | |
| download | gitlab-ce-db948ff3d6a72620391c7cb0f169334cef0438c7.tar.gz | |
Merge pull request #9043 from skburgart/fix/merge-wording
Change merging notification to sound more natural
| -rw-r--r-- | app/views/projects/merge_requests/show/_state_widget.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |