Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.		2022-02-26 09:29:23 +01:00
..
admin
concerns
trends
web
account_alias_spec.rb
account_conversation_spec.rb	Add conversations API (#8832)	2018-10-07 23:44:58 +02:00
account_deletion_request_spec.rb
account_domain_block_spec.rb
account_filter_spec.rb
account_migration_spec.rb
account_moderation_note_spec.rb
account_spec.rb
account_statuses_cleanup_policy_spec.rb
announcement_mute_spec.rb
announcement_reaction_spec.rb
announcement_spec.rb
appeal_spec.rb
backup_spec.rb
block_spec.rb
canonical_email_block_spec.rb
conversation_mute_spec.rb
conversation_spec.rb	Revert "Remove conversation URI (#11423)" (#11424)	2019-07-28 17:47:37 +02:00
custom_emoji_category_spec.rb
custom_emoji_filter_spec.rb
custom_emoji_spec.rb
custom_filter_spec.rb
device_spec.rb
domain_allow_spec.rb
domain_block_spec.rb
email_domain_block_spec.rb
encrypted_message_spec.rb
export_spec.rb
favourite_spec.rb
featured_tag_spec.rb
follow_recommendation_suppression_spec.rb
follow_request_spec.rb
follow_spec.rb
home_feed_spec.rb
identity_spec.rb
import_spec.rb
invite_spec.rb
ip_block_spec.rb
list_account_spec.rb
list_spec.rb
login_activity_spec.rb
marker_spec.rb
media_attachment_spec.rb	Fix error when rendering public pages with media attachments (#16763)	2021-10-13 15:27:19 +02:00
mention_spec.rb
mute_spec.rb
notification_spec.rb
one_time_key_spec.rb
poll_spec.rb
poll_vote_spec.rb
preview_card_spec.rb
public_feed_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-28 08:58:32 +01:00
relationship_filter_spec.rb
relay_spec.rb
remote_follow_spec.rb
report_filter_spec.rb
report_spec.rb
rule_spec.rb	Add server rules (#15769)	2021-02-21 19:50:12 +01:00
scheduled_status_spec.rb
session_activation_spec.rb
setting_spec.rb
site_upload_spec.rb
status_edit_spec.rb
status_pin_spec.rb
status_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-11 21:53:20 +01:00
status_stat_spec.rb
system_key_spec.rb
tag_feed_spec.rb
tag_spec.rb
unavailable_domain_spec.rb
user_invite_request_spec.rb
user_spec.rb
webauthn_credentials_spec.rb