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	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	2019-08-06 15:33:03 +02:00
account_identity_proof_fabricator.rb	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	2019-08-06 15:33:03 +02:00
account_moderation_note_fabricator.rb
account_pin_fabricator.rb
account_stat_fabricator.rb
account_tag_stat_fabricator.rb	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
account_warning_fabricator.rb
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	Add conversation model, <ostatus:conversation /> (#3016)	2017-05-12 19:09:21 +02:00
conversation_mute_fabricator.rb
custom_emoji_category_fabricator.rb	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
custom_emoji_fabricator.rb
custom_filter_fabricator.rb
domain_allow_fabricator.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
domain_block_fabricator.rb
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
list_account_fabricator.rb
list_fabricator.rb
media_attachment_fabricator.rb
mention_fabricator.rb
mute_fabricator.rb	More status specs (#2564)	2017-04-28 15:10:41 +02:00
notification_fabricator.rb
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
status_stat_fabricator.rb
tag_fabricator.rb
user_fabricator.rb
user_invite_request_fabricator.rb	Add "why do you want to join" field to invite requests (#10524)	2019-04-09 23:06:30 +09:00
web_push_subscription_fabricator.rb
web_setting_fabricator.rb