David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		2018-02-04 16:36:19 -06:00
..
access_token_fabricator.rb
accessible_access_token_fabricator.rb
account_domain_block_fabricator.rb
account_fabricator.rb
account_moderation_note_fabricator.rb
admin_action_log_fabricator.rb
application_fabricator.rb
block_fabricator.rb
conversation_fabricator.rb
conversation_mute_fabricator.rb
custom_emoji_fabricator.rb
domain_block_fabricator.rb
email_domain_block_fabricator.rb
favourite_fabricator.rb
follow_fabricator.rb
follow_request_fabricator.rb
glitch_keyword_mute_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
report_fabricator.rb
session_activation_fabricator.rb
setting_fabricator.rb
site_upload_fabricator.rb
status_fabricator.rb
status_pin_fabricator.rb
stream_entry_fabricator.rb
subscription_fabricator.rb
tag_fabricator.rb
user_fabricator.rb	Ensure unique identifiers in fabricated objects in tests (#3173)	2017-05-20 17:09:40 +02:00
web_push_subscription_fabricator.rb
web_setting_fabricator.rb