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.

Claire b0781a933d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.		3 years ago
..
chewy	Fix error MethodError in Chewy::Strategy::Sidekiq::Worker (#17912)	3 years ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
helpers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
javascript	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
mailers	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	3 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
presenters	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
serializers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
services	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
validators	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
views	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
workers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago