Claire ab59743c13 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Upstream removed a line close to one modified by glitch-soc.
  Removed the line as upstream did.

2023-01-14 22:34:09 +01:00

..

account_associations.rb

Add notifications for statuses deleted by moderators (#17204)

2022-01-17 09:41:33 +01:00

account_avatar.rb

Fix metadata scrubbing removing color profile from images (#20389)

2022-11-11 09:20:10 +01: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

Fix metadata scrubbing removing color profile from images (#20389)

2022-11-11 09:20:10 +01:00

account_interactions.rb

Add follow request banner on account header (#20785)

2022-12-15 18:50:11 +01: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 unbounded recursion in account discovery (#22025)

2022-12-07 00:15:24 +01:00

domain_normalizable.rb

Fix error when invalid domain name is submitted (#19474)

2022-11-14 08:07:14 +01: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

Don't crash on unobtainable avatars (#22462)

2023-01-13 16:40:06 +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

Remove dead code and refactor status threading code (#20357)

2022-11-10 22:30:00 +01:00