Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2022-06-28 11:11:18 +02:00
..
account_associations.rb
account_avatar.rb
account_counters.rb
account_finder_concern.rb
account_header.rb
account_interactions.rb
account_merging.rb
attachmentable.rb
cacheable.rb	Fix cache_associated no longer working (#7320)	2018-05-03 10:41:41 +02:00
domain_materializable.rb
domain_normalizable.rb
expireable.rb	Fix not being able to change world filter expiration back to “Never” (#15858)	2021-03-12 05:25:50 +01:00
follow_limitable.rb	Fix being able to import more than allowed number of follows (#15384)	2020-12-26 23:52:46 +01:00
ldap_authenticable.rb
lockable.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
omniauthable.rb
paginable.rb	allow pagination by min_id and max_id (#14776)	2020-09-12 17:09:49 +02:00
pam_authenticable.rb	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	2019-04-25 02:49:25 +02:00
rate_limitable.rb
redisable.rb
relationship_cacheable.rb
remotable.rb	Fix to be able to redownload avatar and header (#16190)	2021-05-11 14:19:22 +02:00
status_snapshot_concern.rb
status_threading_concern.rb
user_roles.rb	Add moderation API (#9387)	2019-06-20 02:52:34 +02:00