summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDennis Tang <dtang@gitlab.com>2018-06-04 06:56:09 -0700
committerDennis Tang <dtang@gitlab.com>2018-06-04 06:56:09 -0700
commit313da6d3d03bb2b3a00071d1228f5b342e92abc4 (patch)
tree00422d132de409352d3a8452aa8be4dd630ca873 /app/assets
parenta5217676ed4084f6f08a3fbeca99149a86c82d92 (diff)
parent9c2961947826442e780285cb551583b09cf6dae9 (diff)
downloadgitlab-ce-313da6d3d03bb2b3a00071d1228f5b342e92abc4.tar.gz
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/ide/components/commit_sidebar/message_field.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/message_field.vue b/app/assets/javascripts/ide/components/commit_sidebar/message_field.vue
index f14fcdc88ed..0ac0af2feaa 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/message_field.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/message_field.vue
@@ -54,7 +54,7 @@ export default {
placement: 'top',
content: sprintf(
__(`
- The character highligher helps you keep the subject line to %{titleLength} characters
+ The character highlighter helps you keep the subject line to %{titleLength} characters
and wrap the body at %{bodyLength} so they are readable in git.
`),
{ titleLength: MAX_TITLE_LENGTH, bodyLength: MAX_BODY_LENGTH },