Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		2019-07-19 18:26:49 +02:00
..
assets
access_token_fabricator.rb	Introduce access token fabricators (#4401)	2017-07-27 15:16:07 +02:00
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
account_identity_proof_fabricator.rb
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	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
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	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
block_fabricator.rb	add more tests to models	2017-04-05 00:29:56 +02:00
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
custom_emoji_fabricator.rb	Custom emoji (#4988)	2017-09-19 02:42:40 +02:00
custom_filter_fabricator.rb
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
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	Add tests for Setting (#5683)	2017-11-14 11:08:04 +09:00
site_upload_fabricator.rb
status_fabricator.rb	Switch to static URIs, new URI format in both protocols for new statuses (#4815)	2017-09-06 19:01:28 +02:00
status_pin_fabricator.rb	Pinned statuses (#4675)	2017-08-25 01:41:18 +02:00
status_stat_fabricator.rb
subscription_fabricator.rb	Spec coverage and refactor for pubsub/delivery worker (#3021)	2017-05-12 20:35:36 +02:00
tag_fabricator.rb	Ensure unique identifiers in fabricated objects in tests (#3173)	2017-05-20 17:09:40 +02:00
user_fabricator.rb
user_invite_request_fabricator.rb
web_push_subscription_fabricator.rb	Ensure push subscription is immediately removed when application is revoked (#7548)	2018-05-19 21:05:08 +02:00
web_setting_fabricator.rb	Ensure push subscription is immediately removed when application is revoked (#7548)	2018-05-19 21:05:08 +02:00