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
..
activitypub	Revert #5772 (#6221)	7 years ago
admin	Improve require_admin! and require_staff! filters (#7018)	7 years ago
api	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
auth	…
concerns	Set the default locale in config (#6580)	7 years ago
oauth	…
settings	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
well_known	…
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	…
application_controller_spec.rb	Improve require_admin! and require_staff! filters (#7018)	7 years ago
authorize_follows_controller_spec.rb	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	7 years ago
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
home_controller_spec.rb	Redirect from Web tag timeline to public tag timeline if not signed in (#6633)	7 years ago
manifests_controller_spec.rb	…
media_controller_spec.rb	…
remote_follow_controller_spec.rb	…
statuses_controller_spec.rb	…
stream_entries_controller_spec.rb	…
tags_controller_spec.rb	…