mastodon/app
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.
2017-11-17 17:41:15 -06:00
..
controllers Merge remote-tracking branch 'origin/master' into merge-upstream 2017-11-17 17:40:00 -06:00
helpers Merge remote-tracking branch 'origin/master' into gs-master 2017-11-16 22:52:37 -06:00
javascript Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-17 20:17:12 +00:00
lib Merge remote-tracking branch 'origin/master' into merge-upstream 2017-11-17 17:40:00 -06:00
mailers Add ability to disable login and mark accounts as memorial (#5615) 2017-11-07 19:06:44 +01:00
models Update annotations on Follow, FollowRequest, and Mute. 2017-11-17 17:41:15 -06:00
policies Update StatusPolicy to check current_account for local_only? toots. 2017-11-17 09:07:21 -06:00
presenters Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream 2017-09-28 09:18:35 +02:00
serializers Merge remote-tracking branch 'origin/master' into merge-upstream 2017-11-17 17:40:00 -06:00
services Merge remote-tracking branch 'origin/master' into merge-upstream 2017-11-17 17:40:00 -06:00
validators Merge upstream 2.0ish #165 2017-10-11 10:43:10 -07:00
views Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-17 20:17:12 +00:00
workers Lists (#5703) 2017-11-18 00:16:48 +01:00