Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml		2019-08-07 13:56:48 +02:00
..
assets
access_token_fabricator.rb
accessible_access_token_fabricator.rb
account_domain_block_fabricator.rb
account_fabricator.rb
account_identity_proof_fabricator.rb
account_moderation_note_fabricator.rb
account_pin_fabricator.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	2018-08-09 09:56:53 +02:00
account_stat_fabricator.rb
account_tag_stat_fabricator.rb
account_warning_fabricator.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
account_warning_preset_fabricator.rb
admin_action_log_fabricator.rb
application_fabricator.rb
backup_fabricator.rb
block_fabricator.rb
bookmark_fabricator.rb
conversation_account_fabricator.rb
conversation_fabricator.rb
conversation_mute_fabricator.rb	Feature conversations muting (#3017)	2017-05-15 03:04:13 +02:00
custom_emoji_category_fabricator.rb	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
custom_emoji_fabricator.rb	Custom emoji (#4988)	2017-09-19 02:42:40 +02:00
custom_filter_fabricator.rb
domain_allow_fabricator.rb
domain_block_fabricator.rb	Cover Admin::DomainBlocksController more (#3329)	2017-06-25 21:42:36 +02:00
email_domain_block_fabricator.rb
favourite_fabricator.rb
featured_tag_fabricator.rb
follow_fabricator.rb
follow_request_fabricator.rb
identity_fabricator.rb
import_fabricator.rb
invite_fabricator.rb	Add consumable invites (#5814)	2017-11-27 16:07:59 +01:00
list_account_fabricator.rb
list_fabricator.rb
media_attachment_fabricator.rb	Update fabricator for MediaAttachment to attach a file according to type (#3862)	2017-06-20 20:40:45 +02:00
mention_fabricator.rb
mute_fabricator.rb
notification_fabricator.rb	Change columns in notifications nonnullable (#6764)	2018-03-24 12:51:28 +01:00
poll_fabricator.rb
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	Pinned statuses (#4675)	2017-08-25 01:41:18 +02:00
status_stat_fabricator.rb
tag_fabricator.rb
user_fabricator.rb
user_invite_request_fabricator.rb
web_push_subscription_fabricator.rb
web_setting_fabricator.rb