You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 67e77f230e Merge remote-tracking branch 'origin/master' into gs-master ... 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.		7 years ago
..
controllers	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
fabricators	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
features	…
fixtures	Added FetchRemoteAccountService spec (#6456)	7 years ago
helpers	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
lib	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
mailers	Account archive download (#6460)	7 years ago
models	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
policies	Update StatusPolicy to check current_account for local_only? toots.	7 years ago
presenters	Isolate each specs for cache store (#6450)	7 years ago
requests	…
routing	…
services	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
support	Remove empty strings (#5732)	7 years ago
validators	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
views	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
workers	Lists (#5703)	7 years ago
rails_helper.rb	Isolate each specs for cache store (#6450)	7 years ago
spec_helper.rb	Full-text search for authorized statuses (#6423)	7 years ago