Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Load custom emoji in background instead of before page load (fixes #6340) #7047

Merged
merged 1 commit into from
Apr 4, 2018
Merged

Conversation

ladyisatis
Copy link
Contributor

For instances with large sets of custom emoji (e.g. those using Mutant Standard), moves custom emoji loading to a REST API calling to /api/v1/custom_emojis from the client side as opposed to fetching all custom emoji on the server side before page load.

@Gargron Gargron merged commit b08ab32 into mastodon:master Apr 4, 2018
hannahwhy added a commit to glitch-soc/mastodon that referenced this pull request Apr 9, 2018
  Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
mastodon#7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants