Merge pull request #9043 from skburgart/fix/merge-wording
Change merging notification to sound more natural
This commit is contained in:
commit
db948ff3d6
|
@ -29,7 +29,7 @@
|
||||||
%h4
|
%h4
|
||||||
Merge in progress...
|
Merge in progress...
|
||||||
%p
|
%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?
|
- unless @commits.any?
|
||||||
%h4 Nothing to merge
|
%h4 Nothing to merge
|
||||||
|
|
Loading…
Reference in New Issue