diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-14 17:34:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 17:34:30 +0100 |
| commit | 76d6fe63c3a4a68bb26eb8eeea35e52207e35cbc (patch) | |
| tree | 6e84e0708e5e32fdcbf7c99e136882c1f809e252 /app/views/admin/custom_emojis/new.html.haml | |
| parent | 988f5bf0266483659b03f1b0926d0b9ff9e85a8f (diff) | |
| parent | a945182b568d7aebd6b181b60f58b1e1880746c7 (diff) | |
Merge pull request #1717 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/custom_emojis/new.html.haml')
| -rw-r--r-- | app/views/admin/custom_emojis/new.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/custom_emojis/new.html.haml b/app/views/admin/custom_emojis/new.html.haml index e15a07cb8..95996dec8 100644 --- a/app/views/admin/custom_emojis/new.html.haml +++ b/app/views/admin/custom_emojis/new.html.haml @@ -7,7 +7,7 @@ .fields-group = f.input :shortcode, wrapper: :with_label, label: t('admin.custom_emojis.shortcode'), hint: t('admin.custom_emojis.shortcode_hint') .fields-group - = f.input :image, wrapper: :with_label, input_html: { accept: 'image/png' }, hint: t('admin.custom_emojis.image_hint') + = f.input :image, wrapper: :with_label, input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(' ') }, hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LIMIT)) .actions = f.button :button, t('admin.custom_emojis.upload'), type: :submit |