Thibaut Girka 0ae7d84273 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `package.json`		2019-11-06 14:38:28 +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	Fix attachment not being re-downloaded even if file is not stored (#12125)	2019-10-09 07:10:46 +02:00
account_stat_spec.rb	Fix account counters being overwritten by parallel writes (#12045)	2019-10-02 04:59:37 +02:00
account_tag_stat_spec.rb	…
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	…
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	Fix performance of home feed regeneration (#12084)	2019-10-06 22:11:17 +02:00
identity_spec.rb	…
import_spec.rb	…
invite_spec.rb	…
list_account_spec.rb	…
list_spec.rb	…
marker_spec.rb	…
media_attachment_spec.rb	Fix remote media descriptions being cut off at 420 chars (#12262)	2019-11-04 13:00:16 +01:00
mention_spec.rb	…
mute_spec.rb	…
notification_spec.rb	…
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	2019-10-10 17:26:08 +02:00
status_stat_spec.rb	…
tag_spec.rb	…
trending_tags_spec.rb	…
user_invite_request_spec.rb	…
user_spec.rb	…