Thibaut Girka e9ad99bc93 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.		2020-07-07 15:58:45 +02:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-07 15:58:45 +02:00
fabricators	Change move handler to carry blocks over (#14144)	2020-07-01 13:51:15 +02:00
features	Add submit button to the top of preferences pages (#13068)	2020-03-08 16:04:03 +01:00
fixtures
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-04 21:47:37 +02:00
lib	Add support for “start” and “reversed” attributes to ol element	2020-07-01 01:02:27 +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-07-01 19:23:14 +02:00
policies
presenters
requests
routing
serializers/activitypub
services	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-07 15:58:45 +02:00
support	Fix base64-encoded file uploads not being possible (#12748)	2020-01-04 01:54:07 +01:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-03 09:22:58 +01:00
views
workers	Change move handler to carry blocks over (#14144)	2020-07-01 13:51:15 +02:00
rails_helper.rb	Bump sidekiq from 5.2.7 to 6.0.4 (#11727)	2020-03-21 12:04:54 +09:00
spec_helper.rb