Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.		2018-10-30 17:52:08 +01:00
..
activitypub	Allow inbox owner to view implicitly targeted ActivityPub payload (#9093)	2018-10-25 18:12:22 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 17:52:08 +01:00
concerns	Improve signature verification safeguards (#8959)	2018-10-12 07:00:41 +02:00
oauth	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-11 16:51:26 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +02:00
well_known	…
about_controller.rb	…
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	…
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-28 08:37:49 +01:00
authorize_interactions_controller.rb	…
custom_css_controller.rb	Add admin custom CSS setting (#8399)	2018-08-24 04:33:27 +02: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	…
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	…
media_proxy_controller.rb	…
remote_follow_controller.rb	…
remote_interaction_controller.rb	…
remote_unfollows_controller.rb	…
shares_controller.rb	…
statuses_controller.rb	Set Content-Security-Policy rules through RoR's config (#8957)	2018-10-11 20:35:46 +02:00
stream_entries_controller.rb	…
tags_controller.rb	…