Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.		2020-01-04 23:04:42 +01:00
..
admin	…
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
form	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
web	…
account_alias_spec.rb	Add account migration UI (#11846)	2019-09-19 20:58:19 +02:00
account_conversation_spec.rb	…
account_domain_block_spec.rb	…
account_filter_spec.rb	…
account_migration_spec.rb	Add account migration UI (#11846)	2019-09-19 20:58:19 +02:00
account_moderation_note_spec.rb	…
account_spec.rb	Fix base64-encoded file uploads not being possible (#12748)	2020-01-04 01:54:07 +01:00
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	…
backup_spec.rb	…
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	…
domain_allow_spec.rb	…
domain_block_spec.rb	…
email_domain_block_spec.rb	…
export_spec.rb	…
favourite_spec.rb	…
featured_tag_spec.rb	…
follow_request_spec.rb	…
follow_spec.rb	…
home_feed_spec.rb	Fix performance of home feed regeneration (#12084)	2019-10-06 22:11:17 +02:00
identity_spec.rb	…
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	Fix base64-encoded file uploads not being possible (#12748)	2020-01-04 01:54:07 +01:00
mention_spec.rb	…
mute_spec.rb	…
notification_spec.rb	Add follow_request notification type (#12198)	2019-12-01 17:25:29 +01:00
poll_spec.rb	…
poll_vote_spec.rb	…
preview_card_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	2019-10-10 17:26:08 +02:00
status_stat_spec.rb	…
tag_spec.rb	Fix hashtags being split by ZWNJ character (#11821)	2019-09-13 16:01:26 +02:00
trending_tags_spec.rb	…
user_invite_request_spec.rb	…
user_spec.rb	…