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 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.		4 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
fabricators	Add user notes on accounts (#14148)	4 years ago
features	…
fixtures	…
helpers	…
lib	Merge branch 'master' into glitch-soc/merge-upstream	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	4 years ago
policies	…
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
support	…
validators	…
views	…
workers	Add user notes on accounts (#14148)	4 years ago
rails_helper.rb	…
spec_helper.rb	…