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 83dc54c487 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		4 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
fabricators	Add E2EE API (#13820)	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	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
mailers	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	4 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	4 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	Move create/destroy actions for api/v1/statuses to namespace (#3678)	8 years ago
serializers/activitypub	Fix account URI in UpdatePollSerializer (#11194)	5 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	4 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	5 years ago
workers	Make domain block/silence/reject-media code more robust (#13424)	4 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