summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-04-04 18:10:56 +0200
committerRémy Coutable <remy@rymai.me>2018-04-04 18:10:56 +0200
commit484c3a9c1696c88bd6b5e1ae7b5b4842d3aed485 (patch)
tree3849d0083d4afcdbe97b376b9262bbfaef1503f4
parent165e71bf5f5d2beb7c01c0be1a035fc79c76a62c (diff)
downloadgitlab-ce-484c3a9c1696c88bd6b5e1ae7b5b4842d3aed485.tar.gz
Fix a typo in an externalized message: 'amd' -> 'and'
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--app/views/admin/application_settings/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml
index f4320513aff..88da0596759 100644
--- a/app/views/admin/application_settings/show.html.haml
+++ b/app/views/admin/application_settings/show.html.haml
@@ -76,7 +76,7 @@
%button.btn.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand'
%p
- = _('Auto DevOps, runners amd job artifacts')
+ = _('Auto DevOps, runners and job artifacts')
.settings-content
= render 'ci_cd'