mastodon

Author	SHA1	Message	Date
David Yip	fd98bfd108	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock config/application.rb	2018-04-13 16:36:46 -05:00
Yamagishi Kazutoshi	9761b940ac	Upgrade Rails to version 5.2.0 (#5898 )	2018-04-12 14:45:17 +02:00
kibigo!	8aeda4f064	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
Akihiko Odaki	51f48c8960	Fix order of paginated accounts in FollowerDomainsController and spec (#3357 ) * Fix order of paginated accounts in FollowerDomainsController Unordered pagination could result in unexpected behavior. * Cover Settings::FollowerDomainsController more	2017-09-30 23:06:09 +02:00
takayamaki	aa6740c21b	change sidekiq queueing to bulk push (#3536 )	2017-06-04 00:11:15 +02:00
Eugen	f89e26bdd5	Followers-only post federation (#2111 ) * Make private toots get PuSHed to subscription URLs that belong to domains where you have approved followers * Authorized followers controller, stub for bulk action * Soft block in the background * Add simple test for new controller * Rename Settings::FollowersController to Settings::FollowerDomainsController, paginate results, rename "private" post setting to "followers-only", fix pagination style, improve post privacy preferences style, improve warning style * Extract compose form warnings into own container, show warning when posting to followers-only with unlocked account	2017-04-24 00:38:37 +02:00