Claire 92c06a1113 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line.		2022-07-05 09:33:44 +02:00
..
account_associations.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
account_avatar.rb	Add support for webp uploads (#18506)	2022-05-27 20:06:40 +02:00
account_counters.rb	Fix account deletion sometimes failing because of optimistic locks (#16317)	2021-06-02 17:41:25 +02:00
account_finder_concern.rb	Fix instance actor being incorrectly created when running migrations (#18109)	2022-04-26 21:22:09 +02:00
account_header.rb	Add support for webp uploads (#18506)	2022-05-27 20:06:40 +02:00
account_interactions.rb	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
account_merging.rb	Update fix-duplicates maintenance task (#17731)	2022-03-12 08:33:11 +01:00
attachmentable.rb	Switch from unmaintained paperclip to kt-paperclip (#16724)	2021-09-29 23:52:36 +02:00
cacheable.rb	Fix cache_associated no longer working (#7320)	2018-05-03 10:41:41 +02:00
domain_materializable.rb	Fix performance on instances list in admin UI (#15282)	2020-12-14 09:06:34 +01:00
domain_normalizable.rb	Fix admin page crashing when trying to block an invalid domain name (#13884)	2020-06-01 03:47:20 +02:00
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	Add authentication history (#16408)	2021-06-21 17:07:30 +02:00
lockable.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
omniauthable.rb	Allow login through OpenID Connect (#16221)	2022-03-09 12:07:35 +01:00
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	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
redisable.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
relationship_cacheable.rb	Cache relationships in API (#6482)	2018-02-18 03:14:46 +01:00
remotable.rb	Fix to be able to redownload avatar and header (#16190)	2021-05-11 14:19:22 +02:00
status_snapshot_concern.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-26 19:18:55 +01:00
status_threading_concern.rb	Optimize map { ... }.compact calls (#15513)	2021-01-10 00:32:01 +01:00