]> cat aescling's git repositories - mastodon.git/commit
Add categories for custom emojis (#11196)
authorEugen Rochko <eugen@zeonfederated.com>
Fri, 28 Jun 2019 13:54:10 +0000 (15:54 +0200)
committerGitHub <noreply@github.com>
Fri, 28 Jun 2019 13:54:10 +0000 (15:54 +0200)
commite64e6a03dd1e0978fee48f0596dcfbc7fd29958f
treed3a3da3ebed0fc4b942993bab88240f360903686
parent072158ee973f8e09a0abd34a825d9bce038a5d68
Add categories for custom emojis (#11196)

Fix #7940
13 files changed:
app/controllers/api/v1/custom_emojis_controller.rb
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
app/javascript/mastodon/features/emoji/emoji.js
app/models/custom_emoji.rb
app/models/custom_emoji_category.rb [new file with mode: 0644]
app/serializers/rest/custom_emoji_serializer.rb
db/migrate/20190627222225_create_custom_emoji_categories.rb [new file with mode: 0644]
db/migrate/20190627222826_add_category_id_to_custom_emojis.rb [new file with mode: 0644]
db/schema.rb
lib/mastodon/emoji_cli.rb
spec/fabricators/custom_emoji_category_fabricator.rb [new file with mode: 0644]
spec/models/custom_emoji_category_spec.rb [new file with mode: 0644]
yarn.lock