You cannot 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 c118918520 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes.		2 years ago
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
fabricators	png optimization(loss less) (#19630)	2 years ago
features	Change public accounts pages to mount the web UI (#19319)	2 years ago
fixtures	Merge branch 'main' into glitch-soc/merge-upstream	2 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	Add support for language preferences for trending statuses and links (#18288)	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	Change public accounts pages to mount the web UI (#19319)	2 years ago
routing	Change public accounts pages to mount the web UI (#19319)	2 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)	2 years ago
validators	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
views/statuses	Redirect non-logged-in user to owner statuses on single user mode (#19333)	2 years ago
workers	Fix followers count not being updated when migrating follows (#19998)	2 years ago
rails_helper.rb	Fix single Redis connection being used across all threads (#18135)	2 years ago
spec_helper.rb	Improve tests involving push_bulk (#17508)	2 years ago