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 2a7538aeed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2 years ago
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
fabricators	Add ability to filter individual posts (#18945)	2 years ago
features	Add submit button to the top of preferences pages (#13068)	5 years ago
fixtures	Allow import/export of instance-level domain blocks/allows (#1754)	3 years ago
helpers	Add audit log entries for user roles (#19040)	2 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mailers	Remove digest e-mails (#17985)	2 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
requests	Further preparation for Rails 6 (#15916)	4 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 'main' into glitch-soc/merge-upstream	2 years ago
support	Spelling (#17705)	3 years ago
validators	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
views	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
workers	Remove digest e-mails (#17985)	2 years ago
rails_helper.rb	Fix single Redis connection being used across all threads (#18135)	3 years ago
spec_helper.rb	Improve tests involving push_bulk (#17508)	3 years ago