Claire 6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream added a block of three environment variables, while glitch-soc has a different version of the file overall. Added upstream's changes. - `app/helpers/application_helper.rb`: Upstream added a helper, while glitch-soc had extra helpers. Added upstream's helper.		2024-10-19 19:13:32 +02:00
..
admin	…
account_moderation_note_policy_spec.rb	…
account_policy_spec.rb	…
account_warning_policy_spec.rb	…
account_warning_preset_policy_spec.rb	…
announcement_policy_spec.rb	…
appeal_policy_spec.rb	…
audit_log_policy_spec.rb	…
backup_policy_spec.rb	…
canonical_email_block_policy_spec.rb	…
custom_emoji_policy_spec.rb	…
dashboard_policy_spec.rb	…
delivery_policy_spec.rb	…
domain_allow_policy_spec.rb	…
domain_block_policy_spec.rb	…
email_domain_block_policy_spec.rb	…
follow_recommendation_policy_spec.rb	…
instance_policy_spec.rb	…
invite_policy_spec.rb	…
ip_block_policy_spec.rb	…
poll_policy_spec.rb	…
preview_card_policy_spec.rb	…
preview_card_provider_policy_spec.rb	…
relay_policy_spec.rb	…
report_note_policy_spec.rb	…
report_policy_spec.rb	…
rule_policy_spec.rb	…
settings_policy_spec.rb	…
software_update_policy_spec.rb	…
status_policy_spec.rb	Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream	2024-10-19 19:13:32 +02:00
tag_policy_spec.rb	…
user_policy_spec.rb	…
user_role_policy_spec.rb	…
webhook_policy_spec.rb	…