summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-08-26 20:54:03 +0000
committerMike Greiling <mike@pixelcog.com>2019-08-26 20:54:03 +0000
commitbf2b4c526955829e8eb99fe8557563b2cb8f775f (patch)
tree992c4a039508b6ad08c5d6109ef653da3f9b6503 /app
parent9bac5c4258d4ae39b26b35118ab954c3330a370d (diff)
parent22e2a601a03461d996673f2c8e974c65bcf74eda (diff)
downloadgitlab-ce-bf2b4c526955829e8eb99fe8557563b2cb8f775f.tar.gz
Merge branch 'patch-74' into 'master'
fix: remove double % See merge request gitlab-org/gitlab-ce!32178
Diffstat (limited to 'app')
-rw-r--r--app/views/profiles/preferences/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index d99063e344f..0887e8e64da 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -47,7 +47,7 @@
= s_('Preferences|Layout width')
= f.select :layout, layout_choices, {}, class: 'select2'
.form-text.text-muted
- = s_('Preferences|Choose between fixed (max. 1280px) and fluid (100%%) application layout.')
+ = s_('Preferences|Choose between fixed (max. 1280px) and fluid (%{percentage}) application layout.').html_safe % { percentage: '100%' }
.form-group
= f.label :dashboard, class: 'label-bold' do
= s_('Preferences|Default dashboard')