kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Change merging notification to sound more natural
This commit is contained in:
Robert Schilling 2015-03-28 09:37:18 +01:00
parent 6664da431a 83064492a0
commit db948ff3d6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/projects/merge_requests/show/_state_widget.html.haml
View File

@ -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