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 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		5 years ago
..
account_associations.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
account_avatar.rb	Add WebP support (#9879)	6 years ago
account_counters.rb	…
account_finder_concern.rb	Add ActivityPub actor representing the entire server (#11321)	5 years ago
account_header.rb	Add WebP support (#9879)	6 years ago
account_interactions.rb	…
attachmentable.rb	Fix support for MP4 files that are actually M4V files (#11210)	5 years ago
cacheable.rb	…
domain_normalizable.rb	Add option to overwrite imported data (#9962)	6 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	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	6 years ago
paginable.rb	…
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	…
remotable.rb	…
status_threading_concern.rb	Improved remote thread fetching (#10106)	6 years ago
user_roles.rb	Add moderation API (#9387)	5 years ago