Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.		2020-12-19 00:55:12 +01:00
..
admin
concerns
form	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
web
account_alias_spec.rb
account_conversation_spec.rb
account_deletion_request_spec.rb	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
account_domain_block_spec.rb
account_filter_spec.rb
account_migration_spec.rb
account_moderation_note_spec.rb
account_spec.rb	Fix performance on instances list in admin UI (#15282)	2020-12-14 09:06:34 +01:00
account_stat_spec.rb
account_tag_stat_spec.rb
announcement_mute_spec.rb
announcement_reaction_spec.rb
announcement_spec.rb
backup_spec.rb
block_spec.rb
conversation_mute_spec.rb
conversation_spec.rb	Add conversation model, <ostatus:conversation /> (#3016)	2017-05-12 19:09:21 +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_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
marker_spec.rb
media_attachment_spec.rb
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
relationship_filter_spec.rb
relay_spec.rb
remote_follow_spec.rb
report_filter_spec.rb
report_spec.rb
scheduled_status_spec.rb
session_activation_spec.rb
setting_spec.rb
site_upload_spec.rb
status_pin_spec.rb
status_spec.rb
status_stat_spec.rb
system_key_spec.rb
tag_feed_spec.rb
tag_spec.rb
trending_tags_spec.rb
unavailable_domain_spec.rb
user_invite_request_spec.rb
user_spec.rb
webauthn_credentials_spec.rb