summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2014-02-09 20:20:42 +0100
committerRobert Schilling <rschilling@student.tugraz.at>2014-02-09 20:20:42 +0100
commit725d35edc2680479c83bc9db94d4ac0489be735c (patch)
treefd3bcdb3d85be38f0e626d051afee6b9b9d91dbf
parent54b892153440935a08e00c63db3ec8a607ae3565 (diff)
downloadgitlab-ce-725d35edc2680479c83bc9db94d4ac0489be735c.tar.gz
Fixes #6073, Update grammer in MR accept form
-rw-r--r--app/views/projects/merge_requests/show/_mr_accept.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index 83f2db03b18..a9cbe43fb16 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -60,7 +60,7 @@
.automerge_widget.already_cannot_be_merged.hide
.bs-callout.bs-callout-info
- %strong This merge request already can not be merged. Try to reload page.
+ %strong This merge request can not be merged. Try to reload the page.
.merge-in-progress.hide
.bs-callout.bs-callout-success