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 130aa90d55 Update annotations on Follow, FollowRequest, and Mute. ... Follow and FollowRequest had conflicts in their schema annotations, so I ran latest migrations and let annotate_models fix them up.		7 years ago
..
controllers	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
helpers	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
javascript	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
lib	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
mailers	Add ability to disable login and mark accounts as memorial (#5615)	7 years ago
models	Update annotations on Follow, FollowRequest, and Mute.	7 years ago
policies	Update StatusPolicy to check current_account for local_only? toots.	7 years ago
presenters	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	7 years ago
serializers	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
services	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
validators	Merge upstream 2.0ish #165	7 years ago
views	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
workers	Lists (#5703)	7 years ago