Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		2019-01-10 21:00:30 +01:00
..
access_token_fabricator.rb
accessible_access_token_fabricator.rb
account_domain_block_fabricator.rb
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	Extract counters from accounts table to account_stats table (#9295)	2018-11-19 00:43:52 +01:00
account_tag_stat_fabricator.rb	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
account_warning_fabricator.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
account_warning_preset_fabricator.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
admin_action_log_fabricator.rb
application_fabricator.rb
backup_fabricator.rb
block_fabricator.rb
bookmark_fabricator.rb
conversation_account_fabricator.rb	Add conversations API (#8832)	2018-10-07 23:44:58 +02:00
conversation_fabricator.rb
conversation_mute_fabricator.rb
custom_emoji_fabricator.rb
custom_filter_fabricator.rb
domain_block_fabricator.rb
email_domain_block_fabricator.rb
favourite_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	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
media_attachment_fabricator.rb
mention_fabricator.rb
mute_fabricator.rb
notification_fabricator.rb
relay_fabricator.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
report_fabricator.rb
report_note_fabricator.rb
scheduled_status_fabricator.rb	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
session_activation_fabricator.rb
setting_fabricator.rb
site_upload_fabricator.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
status_fabricator.rb
status_pin_fabricator.rb
status_stat_fabricator.rb
stream_entry_fabricator.rb
subscription_fabricator.rb
tag_fabricator.rb
user_fabricator.rb	Add REST API for creating an account (#9572)	2018-12-24 19:12:38 +01:00
web_push_subscription_fabricator.rb
web_setting_fabricator.rb