Thibaut Girka aae60a2366 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.		2020-06-24 15:33:41 +02:00
..
chewy	Fix searchable status without explicitly mentioning it (#13829)	2020-05-23 05:47:25 +02:00
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
mailers	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	2020-06-09 10:23:06 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00