Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
admin
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
form
web
account_alias_spec.rb
account_conversation_spec.rb
account_domain_block_spec.rb
account_filter_spec.rb
account_migration_spec.rb
account_moderation_note_spec.rb
account_spec.rb	Remove dependency on OStatus2 gem (#12822)	2020-01-11 21:36:53 +01:00
account_stat_spec.rb
account_tag_stat_spec.rb
announcement_mute_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
announcement_reaction_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
announcement_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
backup_spec.rb
block_spec.rb
conversation_mute_spec.rb
conversation_spec.rb
custom_emoji_category_spec.rb
custom_emoji_filter_spec.rb
custom_emoji_spec.rb
custom_filter_spec.rb
domain_allow_spec.rb
domain_block_spec.rb	Allow blocking TLDs, and fix TLD blocks not being editable (#12805)	2020-01-08 22:42:05 +01:00
email_domain_block_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
list_account_spec.rb
list_spec.rb
marker_spec.rb
media_attachment_spec.rb	Fix media attachments without file being uploadable (#12562)	2020-01-23 21:40:03 +01:00
mention_spec.rb
mute_spec.rb
notification_spec.rb	Add follow_request notification type (#12198)	2019-12-01 17:25:29 +01:00
poll_spec.rb
poll_vote_spec.rb
preview_card_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	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-12 15:57:34 +01:00
status_stat_spec.rb
tag_spec.rb
trending_tags_spec.rb
user_invite_request_spec.rb
user_spec.rb