You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.		5 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
fabricators	Change move handler to carry blocks over (#14144)	5 years ago
features	Add submit button to the top of preferences pages (#13068)	5 years ago
fixtures	Add noopener and/or noreferrer (#12202)	5 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
lib	Add support for “start” and “reversed” attributes to ol element	5 years ago
mailers	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	5 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
presenters	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
requests	Fix localization test failing due to order of locale definitions (#12393)	5 years ago
routing	…
serializers/activitypub	Fix account URI in UpdatePollSerializer (#11194)	6 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
support	Fix base64-encoded file uploads not being possible (#12748)	5 years ago
validators	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	Change move handler to carry blocks over (#14144)	5 years ago
rails_helper.rb	Bump sidekiq from 5.2.7 to 6.0.4 (#11727)	5 years ago
spec_helper.rb	Move rspec examples to tmp dir (#12539)	5 years ago