Claire e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.

2026-06-09 21:30:54 +02:00

..

admin

Add moderation consequences for collections (#37974)

2026-02-25 14:32:07 +00:00

account_moderation_note_policy.rb

…

account_policy.rb

Add /api/v1_alpha/accounts/:id/in_collections to list collections you are in (#38657)

2026-04-13 17:28:28 +00:00

account_warning_policy.rb

Add AccountWarning#appeal_eligible? method (#33526)

2025-01-09 15:08:39 +00:00

account_warning_preset_policy.rb

…

announcement_policy.rb

Add ability to email announcements to all users (#33928)

2025-03-06 14:05:27 +00:00

appeal_policy.rb

…

application_policy.rb

…

audit_log_policy.rb

…

backup_policy.rb

Update rubocop to version 1.77.0 (#35128)

2025-06-23 07:40:11 +00:00

canonical_email_block_policy.rb

…

collection_item_policy.rb

Add API to revoke collection item (#38027)

2026-03-02 13:38:03 +00:00

collection_policy.rb

Add "featured collections" collection to actors (#37512)

2026-01-20 08:27:05 +00:00

custom_emoji_policy.rb

…

dashboard_policy.rb

…

delivery_policy.rb

…

domain_allow_policy.rb

…

domain_block_policy.rb

…

email_domain_block_policy.rb

Fix getting a single EmailDomainBlock (#20846)

2022-11-17 10:55:50 +01:00

email_subscription_policy.rb

Add ability to view individual newsletters in admin UI (#39271)

2026-06-08 07:05:27 +00:00

follow_recommendation_policy.rb

…

instance_moderation_note_policy.rb

Implement Instance Moderation Notes (#31529)

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

instance_policy.rb

…

invite_policy.rb

…

ip_block_policy.rb

…

media_attachment_policy.rb

Change media attachments in moderated posts to not be accessible (#34872)

2025-06-12 08:53:02 +00:00

poll_policy.rb

…

preview_card_policy.rb

…

preview_card_provider_policy.rb

…

quote_policy.rb

Add API endpoints to view and revoke one's quoted posts (#35578)

2025-07-31 09:36:51 +00:00

relay_policy.rb

…

report_note_policy.rb

…

report_policy.rb

…

rule_policy.rb

…

settings_policy.rb

…

software_update_policy.rb

Add admin notifications for new Mastodon versions (#26582)

2023-09-01 17:47:07 +02:00

status_policy.rb

Merge commit '66fdd3ae65e13349fbc0b2818d4b91a389075553' into glitch-soc/main

2026-04-08 19:32:32 +02:00

tag_policy.rb

…

terms_of_service_policy.rb

Add terms of service (#33055)

2024-12-09 10:04:46 +00:00

user_policy.rb

…

user_role_policy.rb

Add self_editing? method to user role policy (#33476)

2025-01-07 07:50:19 +00:00

username_block_policy.rb

Add ability to block words in usernames (#35407)

2025-07-29 10:19:15 +00:00

webhook_policy.rb

Add finer permission requirements for managing webhooks (#25463)

2023-06-22 14:52:25 +02:00