Thibaut Girka 90f5d780cb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it.		2020-11-14 00:30:36 +01:00
..
v1	Fix “Show boosts/replies in public timelines” only affecting streaming	2020-11-12 23:44:53 +01:00
v2	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
web	Fix not being able to enable status notifications in Web Push API (#14822)	2020-09-21 17:48:55 +02:00
base_controller.rb	Fix 2FA/sign-in token sessions being valid after password change (#14802)	2020-11-12 23:05:01 +01:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00
proofs_controller.rb	Fix proofs API being inaccessible in secure mode (#12495)	2019-11-28 04:07:49 +01:00