Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream

2025-01-23 13:38:23 +01:00
commit 19fa4cfcf2
@@ -72,7 +72,7 @@
            .input.select.optional
              .label_input
                = f.select :category_id,
-                           options_from_collection_for_select(CustomEmojiCategory.all, 'id', 'name'),
+                           options_from_collection_for_select(CustomEmojiCategory.alphabetic.all, 'id', 'name'),
                           'aria-label': t('admin.custom_emojis.assign_category'),
                           class: 'select optional',
                           prompt: t('admin.custom_emojis.assign_category')