summaryrefslogtreecommitdiff
path: root/app/views/admin/appearances
diff options
context:
space:
mode:
authorAlexis Reigel <alexis.reigel.ext@siemens.com>2018-05-17 19:00:32 +0200
committerAlexis Reigel <alexis.reigel.ext@siemens.com>2018-06-06 11:28:13 +0200
commitd2256300e559e836884fea57210266dae764f13e (patch)
tree45d9e0fedf3327c537e819888c27f0927c27a1bf /app/views/admin/appearances
parentcb564d5831cba9ca8403440a5cbe02d968260da1 (diff)
downloadgitlab-ce-d2256300e559e836884fea57210266dae764f13e.tar.gz
hint the allowed image formats on favicon upload
Diffstat (limited to 'app/views/admin/appearances')
-rw-r--r--app/views/admin/appearances/_form.html.haml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml
index 81979f7b331..ac92b043074 100644
--- a/app/views/admin/appearances/_form.html.haml
+++ b/app/views/admin/appearances/_form.html.haml
@@ -70,7 +70,9 @@
= f.hidden_field :favicon_cache
= f.file_field :favicon, class: ''
.hint
- Maximum file size is 1MB. The resulting favicons will be cropped to be square and scaled down to a size of 32x32 px.
+ Maximum file size is 1MB. Allowed image formats are #{favicon_extension_whitelist}.
+ %br
+ The resulting favicons will be cropped to be square and scaled down to a size of 32x32 px.
.form-actions
= f.submit 'Save', class: 'btn btn-save append-right-10'