Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/fonts/montserrat.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto-mono.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/models/account.rb`: Textual conflict only caused by glitch-soc using a different value for character limits in a nearby line. Applied upstream's changes. - `app/views/statuses/_simple_status.html.haml`: Attribute added to a tag modified by glitch-soc. Added upstream's attributes. - `yarn.lock`: Upstream added/updated dependencies close to glitch-soc-only ones. Updated/added upstream dependencies.		2022-06-02 09:49:38 +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	Add remove from followers api (#16864)	2021-10-18 12:02:35 +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
domain_materializable.rb	Fix performance on instances list in admin UI (#15282)	2020-12-14 09:06:34 +01:00
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	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
pam_authenticable.rb
rate_limitable.rb
redisable.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
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	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
user_roles.rb