Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		2020-08-30 16:13:08 +02:00
..
admin
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-01 19:23:14 +02:00
form
web
account_alias_spec.rb
account_conversation_spec.rb
account_domain_block_spec.rb
account_filter_spec.rb
account_migration_spec.rb
account_moderation_note_spec.rb
account_spec.rb
account_stat_spec.rb	Fix account counters being overwritten by parallel writes (#12045)	2019-10-02 04:59:37 +02:00
account_tag_stat_spec.rb
announcement_mute_spec.rb
announcement_reaction_spec.rb
announcement_spec.rb
backup_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
block_spec.rb
conversation_mute_spec.rb
conversation_spec.rb
custom_emoji_category_spec.rb
custom_emoji_filter_spec.rb
custom_emoji_spec.rb
custom_filter_spec.rb
device_spec.rb
domain_allow_spec.rb
domain_block_spec.rb
email_domain_block_spec.rb
encrypted_message_spec.rb
export_spec.rb
favourite_spec.rb	Cover Favourite more (#3841)	2017-06-19 01:38:50 +02:00
featured_tag_spec.rb
follow_request_spec.rb
follow_spec.rb
home_feed_spec.rb
identity_spec.rb	Add spec for Identity.find_for_oauth (#9441)	2018-12-06 17:38:49 +09:00
import_spec.rb
invite_spec.rb
list_account_spec.rb
list_spec.rb
marker_spec.rb	Add timeline read markers API (#11762)	2019-09-06 13:55:51 +02:00
media_attachment_spec.rb
mention_spec.rb
mute_spec.rb
notification_spec.rb
one_time_key_spec.rb
poll_spec.rb
poll_vote_spec.rb
preview_card_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
relationship_filter_spec.rb
relay_spec.rb
remote_follow_spec.rb
report_filter_spec.rb
report_spec.rb
scheduled_status_spec.rb
session_activation_spec.rb
setting_spec.rb
site_upload_spec.rb
status_pin_spec.rb
status_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
status_stat_spec.rb
system_key_spec.rb
tag_spec.rb
trending_tags_spec.rb
unavailable_domain_spec.rb
user_invite_request_spec.rb
user_spec.rb	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
webauthn_credentials_spec.rb	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00