diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-29 03:32:28 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-29 03:32:28 -0700 |
| commit | ccab346a7899d34ffcdd0169dbc87450eb2aca59 (patch) | |
| tree | 10987cdaad7415a1fb1826f4722247c7c5c2c474 /app | |
| parent | 5f3a7587215a4ff25d3fca0e0aded3b76bc9ac57 (diff) | |
| parent | 7277280d5f276fe97ff97276ce20400bcb5db07c (diff) | |
| download | gitlab-ce-ccab346a7899d34ffcdd0169dbc87450eb2aca59.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
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 |