summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytses@gmail.com>2014-02-10 14:38:04 +0100
committerSytse Sijbrandij <sytses@gmail.com>2014-02-10 14:38:04 +0100
commit6cf24ba9d791ee5e3a57fae3b418732358f467e6 (patch)
treefa9709359b970464602f6f8ae69f203d5dd2d2ad
parent189ae623ca44a282d6df2c17e385d725f34b85a5 (diff)
parent725d35edc2680479c83bc9db94d4ac0489be735c (diff)
downloadgitlab-ce-6cf24ba9d791ee5e3a57fae3b418732358f467e6.tar.gz
Merge pull request #6284 from Razer6/fix_grammer_in_mr_page
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