Claire 487c814eb9 Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Glitch-soc allows a wider range of HTML than upstream.
  Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
  added it there too.

2026-05-22 19:43:42 +02:00

..

account

…

account_suggestions

Fix friends-of-friends recommendations suggesting already-requested accounts (#35604)

2025-07-30 16:28:26 +00:00

admin

Add batch remove for collections in reports (#39020)

2026-05-18 14:53:40 +00:00

annual_report

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

concerns

Merge commit '28e5c3bb5116d012a1f58b4cbfe1a5fb302ac227' into glitch-soc/merge-upstream

2026-04-20 18:51:00 +02:00

fasp

Reject unconfirmed FASPs (#37926)

2026-02-20 14:40:31 +00:00

form

Merge commit 'ba83509ff4ed3f7193f3ca5c5deb3038c39620b1' into glitch-soc/merge-upstream

2026-05-04 21:08:25 +02:00

terms_of_service

…

trends

Merge commit 'db13dddcf90343574dee320fff7e8bb9bf3707e4' into glitch-soc/merge-upstream

2026-04-07 20:08:57 +02:00

user_settings

Update rubocop to version 1.76.0 (#34926)

2025-06-05 12:09:05 +00:00

web

Use delegate in web/push_subscription model for token value (#38313)

2026-03-20 15:48:28 +00:00

account_alias.rb

…

account_conversation.rb

…

account_deletion_request.rb

…

account_domain_block.rb

…

account_filter.rb

Use consistent style in *Filter classes to skip pagination (#38559)

2026-04-07 09:59:36 +00:00

account_migration.rb

Add AccountMigration#remaining_cooldown_days method (#38561)

2026-04-17 14:01:07 +00:00

account_moderation_note.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

account_note.rb

…

account_pin.rb

…

account_relationship_severance_event.rb

Add private method for event export filename (#38454)

2026-03-27 15:25:19 +00:00

account_stat.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

account_statuses_cleanup_policy.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

account_suggestions.rb

Persist follow recommendations from FASP (#35218)

2025-06-30 13:39:36 +00:00

account_summary.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

account_warning_preset.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

account_warning.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

account.rb

Merge commit 'c26003af215da7696e2b0dcece7fa695b1be8871' into glitch-soc/merge-upstream

2026-05-18 19:35:08 +02:00

admin.rb

…

announcement_filter.rb

Use consistent style in *Filter classes to skip pagination (#38559)

2026-04-07 09:59:36 +00:00

announcement_mute.rb

…

announcement_reaction.rb

Add coverage for AnnouncementReaction model (#35543)

2025-07-28 07:59:32 +00:00

announcement.rb

…

appeal.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

application_record.rb

…

async_refresh.rb

Add FASP follow recommendation support (#34964)

2025-06-16 10:43:27 +00:00

backup.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

block.rb

Fix incorrect only option in before_validation filters (#38704)

2026-04-17 13:36:38 +00:00

bookmark.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

bulk_import_row.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

bulk_import.rb

Add counting convenience methods on BulkImport (#38465)

2026-03-30 08:52:48 +00:00

canonical_email_block.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

collection_item.rb

Only preload accounts in Collections when needed (#39143)

2026-05-22 10:11:41 +00:00

collection_report.rb

Allow reporting (local) Collections (#37848)

2026-02-13 11:11:44 +00:00

collection.rb

Only preload accounts in Collections when needed (#39143)

2026-05-22 10:11:41 +00:00

content_retention_policy.rb

…

context.rb

…

conversation_mute.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

conversation.rb

Fix creation of duplicate conversations (#37108)

2025-12-03 14:33:27 +00:00

custom_emoji_category.rb

Emoji: Update emoji categories with featured emoji (#37084)

2025-12-02 10:30:08 +00:00

custom_emoji_filter.rb

Use consistent style in *Filter classes to skip pagination (#38559)

2026-04-07 09:59:36 +00:00

custom_emoji.rb

Merge commit 'bf32befcc21831b31f684795bb211b2f1f4cfb6d' into glitch-soc/merge-upstream

2026-03-12 19:01:28 +01:00

custom_filter_keyword.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

custom_filter_status.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

custom_filter.rb

Use to_json call for raw event strings (#38215)

2026-03-16 13:55:58 +00:00

direct_feed.rb

…

domain_allow.rb

Add coverage for "domain variants" consumers (#35995)

2025-12-16 10:24:27 +00:00

domain_block.rb

Add domain_variants helper to DomainNormalizable concern (#38539)

2026-04-17 15:36:09 +00:00

email_domain_block.rb

Add ability to search email blocks by domain (#38923)

2026-05-06 15:54:12 +00:00

email_subscription.rb

Merge commit from fork

2026-04-15 15:22:33 +02:00

export.rb

Fix bookmarks export when one bookmarked status is soft-deleted (#36576)

2025-10-23 11:51:23 +00:00

extended_description.rb

…

fasp.rb

…

favourite.rb

…

featured_tag.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

feed.rb

…

follow_recommendation_filter.rb

…

follow_recommendation_mute.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

follow_recommendation_suppression.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

follow_recommendation.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

follow_request.rb

Fix incorrect only option in before_validation filters (#38704)

2026-04-17 13:36:38 +00:00

follow.rb

Fix incorrect only option in before_validation filters (#38704)

2026-04-17 13:36:38 +00:00

generated_annual_report.rb

Add account_id attribute to AnnualReport entity (#37182)

2025-12-09 15:59:40 +00:00

home_feed.rb

Experimental Async Refreshes API (#34918)

2025-06-12 14:54:00 +00:00

identity.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

instance_filter.rb

…

instance_moderation_note.rb

Implement Instance Moderation Notes (#31529)

2025-06-25 08:15:44 +00:00

instance.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

invite_filter.rb

…

invite.rb

Use model constants more consistently for view expiration collections (#38589)

2026-04-17 13:57:18 +00:00

ip_block.rb

Use model constants more consistently for view expiration collections (#38589)

2026-04-17 13:57:18 +00:00

keypair.rb

Add support for multiple keypairs for remote accounts (#38279)

2026-03-25 14:52:12 +00:00

link_feed.rb

Add disabled setting for live and topic feeds, as well as user permission to bypass that (#36563)

2025-10-23 08:37:05 +00:00

list_account.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

list_feed.rb

…

list.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

login_activity.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

marker.rb

…

media_attachment.rb

Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream

2026-05-22 19:43:42 +02:00

mention.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

mute.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

notification_group.rb

Fix serialization of added_to_collection notifications (#38612)

2026-04-08 16:40:51 +00:00

notification_permission.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

notification_policy.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

notification_request.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

notification.rb

Add fallback attributes to notifications for new and infrequent notifications (#38832)

2026-04-29 15:53:29 +00:00

poll_vote.rb

…

poll.rb

…

preview_card_provider.rb

Add domain_variants helper to DomainNormalizable concern (#38539)

2026-04-17 15:36:09 +00:00

preview_card_trend.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

preview_card.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

preview_cards_status.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

privacy_policy.rb

…

public_feed.rb

Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream

2025-10-23 18:33:52 +02:00

quote.rb

Fix incorrect only option in before_validation filters (#38704)

2026-04-17 13:36:38 +00:00

relationship_filter.rb

…

relationship_severance_event.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

relay.rb

Use to_json call for Relay enable/disable (#38232)

2026-03-16 15:09:28 +00:00

remote_follow.rb

…

report_filter.rb

…

report_note.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

report.rb

Fix incorrect only option in before_validation filters (#38704)

2026-04-17 13:36:38 +00:00

rule_translation.rb

Rely on pluck for the SELECT in RuleTranslation.languages (#35826)

2025-08-22 23:58:40 +00:00

rule.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

scheduled_status.rb

…

search.rb

Add ability to search for a collection by URL (#38588)

2026-04-08 16:03:35 +00:00

session_activation.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

setting.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

severed_relationship.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

site_upload.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

software_update.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

status_edit.rb

Merge commit 'bf32befcc21831b31f684795bb211b2f1f4cfb6d' into glitch-soc/merge-upstream

2026-03-12 19:01:28 +01:00

status_pin.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

status_stat.rb

Add quotes_count to statuses stats (#35832)

2025-08-25 12:21:28 +00:00

status_trend.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

status.rb

Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream

2026-03-24 12:13:39 +01:00

tag_feed.rb

Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream

2025-10-23 18:33:52 +02:00

tag_follow.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

tag_trend.rb

…

tag.rb

Expand coverage for Tag.search_for method (#38405)

2026-03-26 10:03:17 +00:00

tagged_object.rb

Tag linked FeaturedCollection objects over ActivityPub (#38115)

2026-03-23 13:11:33 +00:00

terms_of_service.rb

Add TermsOfService#usable_effective_date to DRY up view logic (#38095)

2026-03-09 09:38:00 +00:00

tombstone.rb

…

translation.rb

…

trends.rb

…

unavailable_domain.rb

…

user_invite_request.rb

…

user_ip.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

user_role.rb

Add per-user maximum number of collections (#38769)

2026-04-22 12:34:08 +00:00

user_settings.rb

Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream

2026-04-17 18:06:10 +02:00

user.rb

Merge commit '3a84990780fb1b48999f661f0cea5cb29cca4d33' into glitch-soc/merge-upstream

2026-04-15 16:27:32 +02:00

username_block.rb

Use normalizes api for UsernameBlock username change (#35606)

2025-08-05 14:10:28 +00:00

web.rb

…

webauthn_credential.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

webhook.rb

Run annotaterb models after bug fix to re-order model comments (#38172)

2026-03-12 14:00:41 +00:00

worker_batch.rb

Fix async refresh never being finished when status cannot be fetched (#35500)

2025-07-29 09:23:32 +00:00