diff options
| author | Steven Burgart <skburgart@gmail.com> | 2015-03-27 15:50:54 -0400 |
|---|---|---|
| committer | Steven Burgart <skburgart@gmail.com> | 2015-03-27 15:50:54 -0400 |
| commit | 83064492a0281f44f4e3e5726a9a92183c06330a (patch) | |
| tree | a6a47deb95f0e3cf514ddd484dd9f8e7d46e55d2 /app | |
| parent | 3d4c2d0b510f15ac3f0abe6ba4468dd019b06278 (diff) | |
| download | gitlab-ce-83064492a0281f44f4e3e5726a9a92183c06330a.tar.gz | |
Change merging notification to sound more natural
Diffstat (limited to 'app')
| -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 |