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 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		5 years ago
..
account_associations.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
account_avatar.rb	Remove WebP support (#11589)	5 years ago
account_counters.rb	Add `tootctl cache recount` command (#11597)	5 years ago
account_finder_concern.rb	Add ActivityPub actor representing the entire server (#11321)	5 years ago
account_header.rb	Remove WebP support (#11589)	5 years ago
account_interactions.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
attachmentable.rb	Include max image dimensions in error (#11552)	5 years ago
cacheable.rb	Fix cache_associated no longer working (#7320)	7 years ago
domain_normalizable.rb	Fix crash when saving invalid domain name (#11528)	5 years ago
expireable.rb	Fix poll update handler calling method was that was not available (#10246)	6 years ago
ldap_authenticable.rb	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	6 years ago
omniauthable.rb	Change unconfirmed user login behaviour (#11375)	5 years ago
paginable.rb	Fix timeline pagination (#8827)	6 years ago
pam_authenticable.rb	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	6 years ago
redisable.rb	Create Redisable#redis (#9633)	6 years ago
relationship_cacheable.rb	Cache relationships in API (#6482)	7 years ago
remotable.rb	Add retry for failed media downloads and `tootctl media refresh` (#11775)	5 years ago
status_threading_concern.rb	Improved remote thread fetching (#10106)	6 years ago
user_roles.rb	Add moderation API (#9387)	5 years ago