Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +01:00
..
access_token_fabricator.rb
accessible_access_token_fabricator.rb
account_domain_block_fabricator.rb	Ensure unique identifiers in fabricated objects in tests (#3173)	2017-05-20 17:09:40 +02:00
account_fabricator.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
account_moderation_note_fabricator.rb
account_pin_fabricator.rb
account_stat_fabricator.rb
account_tag_stat_fabricator.rb
account_warning_fabricator.rb
account_warning_preset_fabricator.rb
admin_action_log_fabricator.rb
application_fabricator.rb	Fix tests, add applications to eager loading/cache for statuses, fix	2017-01-15 14:01:33 +01:00
backup_fabricator.rb
block_fabricator.rb
bookmark_fabricator.rb
conversation_account_fabricator.rb
conversation_fabricator.rb
conversation_mute_fabricator.rb
custom_emoji_fabricator.rb	Custom emoji (#4988)	2017-09-19 02:42:40 +02:00
custom_filter_fabricator.rb	Keyword/phrase filtering (#7905)	2018-06-29 15:34:36 +02:00
domain_block_fabricator.rb
email_domain_block_fabricator.rb	Implement EmailBlackList (#5109)	2017-10-04 15:16:10 +02:00
favourite_fabricator.rb
featured_tag_fabricator.rb
follow_fabricator.rb
follow_request_fabricator.rb
identity_fabricator.rb
import_fabricator.rb
invite_fabricator.rb
list_account_fabricator.rb
list_fabricator.rb
media_attachment_fabricator.rb
mention_fabricator.rb
mute_fabricator.rb
notification_fabricator.rb
poll_fabricator.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
poll_vote_fabricator.rb
relay_fabricator.rb
report_fabricator.rb
report_note_fabricator.rb
scheduled_status_fabricator.rb
session_activation_fabricator.rb
setting_fabricator.rb
site_upload_fabricator.rb
status_fabricator.rb
status_pin_fabricator.rb
status_stat_fabricator.rb
stream_entry_fabricator.rb
subscription_fabricator.rb
tag_fabricator.rb
user_fabricator.rb
web_push_subscription_fabricator.rb
web_setting_fabricator.rb