Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.		2018-12-23 11:28:28 +01:00
..
activitypub	Add specs for activitypub collections controller (#9484)	2018-12-10 21:39:25 +01:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-23 11:28:28 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-23 11:28:28 +01:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 17:52:08 +01:00
concerns	Remove RemoteAccountControllerConcern never used (#9482)	2018-12-10 21:38:01 +01:00
oauth
settings	Add a per-user setting to hide followers count	2018-12-20 14:51:12 +01:00
well_known
about_controller.rb
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb	Exclude local-only toots from atom feeds	2018-11-13 18:55:57 +01:00
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
authorize_interactions_controller.rb
custom_css_controller.rb
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-23 11:28:28 +01:00
emojis_controller.rb
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +02:00
follower_accounts_controller.rb	Add a per-user setting to hide followers count	2018-12-20 14:51:12 +01:00
following_accounts_controller.rb
home_controller.rb
intents_controller.rb
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +02:00
manifests_controller.rb
media_controller.rb	fix CSP / X-Frame-Options for media embeds (#9558)	2018-12-18 16:40:30 +01:00
media_proxy_controller.rb
remote_follow_controller.rb
remote_interaction_controller.rb
remote_unfollows_controller.rb
shares_controller.rb
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-06 12:44:38 +01:00
stream_entries_controller.rb
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-06 15:22:44 +01:00