Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied.		2023-12-21 19:31:12 +01:00
..
account	…
admin	…
concerns	Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream	2023-12-21 19:31:12 +01:00
form	Add spec coverage for `models/form/custom_emoji_batch` class (#28388)	2023-12-18 12:41:37 +00:00
trends	…
user_settings	…
web	…
account_conversation_spec.rb	…
account_domain_block_spec.rb	…
account_filter_spec.rb	…
account_migration_spec.rb	…
account_spec.rb	…
account_statuses_cleanup_policy_spec.rb	…
account_warning_preset_spec.rb	…
announcement_spec.rb	Improve spec coverage for `models/announcement` class (#28350)	2023-12-14 10:29:10 +00:00
appeal_spec.rb	…
block_spec.rb	…
canonical_email_block_spec.rb	…
conversation_spec.rb	…
custom_emoji_category_spec.rb	…
custom_emoji_filter_spec.rb	…
custom_emoji_spec.rb	Improve spec coverage for `models/announcement` class (#28350)	2023-12-14 10:29:10 +00:00
domain_allow_spec.rb	…
domain_block_spec.rb	…
email_domain_block_spec.rb	…
export_spec.rb	…
extended_description_spec.rb	…
favourite_spec.rb	…
follow_request_spec.rb	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream	2023-12-17 23:04:16 +01:00
follow_spec.rb	…
home_feed_spec.rb	…
identity_spec.rb	…
import_spec.rb	…
invite_spec.rb	…
ip_block_spec.rb	…
marker_spec.rb	…
media_attachment_spec.rb	…
mention_spec.rb	…
notification_spec.rb	…
one_time_key_spec.rb	…
poll_spec.rb	…
poll_vote_spec.rb	…
preview_card_provider_spec.rb	…
preview_card_spec.rb	…
privacy_policy_spec.rb	…
public_feed_spec.rb	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	2023-12-18 18:34:25 +01:00
relationship_filter_spec.rb	…
remote_follow_spec.rb	…
report_filter_spec.rb	…
report_spec.rb	…
rule_spec.rb	…
session_activation_spec.rb	…
setting_spec.rb	…
site_upload_spec.rb	…
software_update_spec.rb	…
status_edit_spec.rb	…
status_pin_spec.rb	…
status_spec.rb	…
tag_feed_spec.rb	…
tag_spec.rb	…
user_role_spec.rb	…
user_settings_spec.rb	…
user_spec.rb	…
webauthn_credentials_spec.rb	…
webhook_spec.rb	…