mirror of https://github.com/tootsuite/mastodon
67e77f230e
Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load. |
||
|---|---|---|
| .. | ||
| accounts | ||
| apps | ||
| lists | ||
| statuses | ||
| timelines | ||
| accounts_controller_spec.rb | ||
| apps_controller_spec.rb | ||
| blocks_controller_spec.rb | ||
| custom_emojis_controller_spec.rb | ||
| domain_blocks_controller_spec.rb | ||
| favourites_controller_spec.rb | ||
| follow_requests_controller_spec.rb | ||
| follows_controller_spec.rb | ||
| instances_controller_spec.rb | ||
| lists_controller_spec.rb | ||
| media_controller_spec.rb | ||
| mutes_controller_spec.rb | ||
| notifications_controller_spec.rb | ||
| reports_controller_spec.rb | ||
| search_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| streaming_controller_spec.rb | ||