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 221580a3af Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings.		2 years ago
..
account_associations.rb	Add notifications for statuses deleted by moderators (#17204)	3 years ago
account_avatar.rb	Add support for webp uploads (#18506)	3 years ago
account_counters.rb	Fix account deletion sometimes failing because of optimistic locks (#16317)	4 years ago
account_finder_concern.rb	Fix instance actor being incorrectly created when running migrations (#18109)	3 years ago
account_header.rb	Add support for webp uploads (#18506)	3 years ago
account_interactions.rb	Add ability to filter followed accounts' posts by language (#19095)	2 years ago
account_merging.rb	Update fix-duplicates maintenance task (#17731)	3 years ago
attachmentable.rb	Switch from unmaintained paperclip to kt-paperclip (#16724)	3 years ago
cacheable.rb	Fix cache_associated no longer working (#7320)	7 years ago
domain_materializable.rb	Fix performance on instances list in admin UI (#15282)	4 years ago
domain_normalizable.rb	Fix admin page crashing when trying to block an invalid domain name (#13884)	5 years ago
expireable.rb	Fix not being able to change world filter expiration back to “Never” (#15858)	4 years ago
follow_limitable.rb	Fix being able to import more than allowed number of follows (#15384)	4 years ago
ldap_authenticable.rb	Add authentication history (#16408)	3 years ago
lockable.rb	Refactor how Redis locks are created (#18400)	3 years ago
omniauthable.rb	Allow login through OpenID Connect (#16221)	3 years ago
paginable.rb	allow pagination by min_id and max_id (#14776)	4 years ago
pam_authenticable.rb	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	6 years ago
rate_limitable.rb	Add specific rate limits for posting and following (#13172)	5 years ago
redisable.rb	Refactor how Redis locks are created (#18400)	3 years ago
relationship_cacheable.rb	Cache relationships in API (#6482)	7 years ago
remotable.rb	Fix to be able to redownload avatar and header (#16190)	4 years ago
status_snapshot_concern.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
status_threading_concern.rb	Optimize map { ... }.compact calls (#15513)	4 years ago