Thibaut Girka 0ae7d84273 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `package.json`		2019-11-06 14:38:28 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
features	…
fixtures	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-06 14:38:28 +01:00
mailers	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-06 14:38:28 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
presenters	…
requests	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	2019-08-01 19:14:02 +02:00
routing	…
serializers/activitypub	…
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
views	…
workers	Add domain block notes (#11515)	2019-08-07 20:20:23 +02:00
rails_helper.rb	Fix records not being indexed sometimes (#12024)	2019-10-01 01:19:11 +02:00
spec_helper.rb	…