You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		5 years ago
..
admin	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
concerns	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
form	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
web	…
account_alias_spec.rb	Add account migration UI (#11846)	5 years ago
account_conversation_spec.rb	…
account_domain_block_spec.rb	…
account_filter_spec.rb	…
account_migration_spec.rb	Add account migration UI (#11846)	5 years ago
account_moderation_note_spec.rb	…
account_spec.rb	Fix attachment not being re-downloaded even if file is not stored (#12125)	5 years ago
account_stat_spec.rb	Fix account counters being overwritten by parallel writes (#12045)	5 years ago
account_tag_stat_spec.rb	…
backup_spec.rb	…
block_spec.rb	…
conversation_mute_spec.rb	…
conversation_spec.rb	Revert "Remove conversation URI (#11423)" (#11424)	5 years ago
custom_emoji_category_spec.rb	…
custom_emoji_filter_spec.rb	…
custom_emoji_spec.rb	…
custom_filter_spec.rb	…
domain_allow_spec.rb	Add whitelist mode (#11291)	5 years ago
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)	5 years ago
identity_spec.rb	…
import_spec.rb	…
invite_spec.rb	Fix invites not being disabled upon account suspension (#11412)	5 years ago
list_account_spec.rb	…
list_spec.rb	…
marker_spec.rb	Add timeline read markers API (#11762)	5 years ago
media_attachment_spec.rb	…
mention_spec.rb	…
mute_spec.rb	…
notification_spec.rb	…
poll_spec.rb	…
poll_vote_spec.rb	Implement pending tests (#11415)	5 years ago
preview_card_spec.rb	…
relay_spec.rb	…
remote_follow_spec.rb	Fix uncaught domain normalization error in remote follow (#11703)	5 years ago
report_filter_spec.rb	…
report_spec.rb	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	5 years ago
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	5 years ago
status_stat_spec.rb	…
tag_spec.rb	Fix hashtags being split by ZWNJ character (#11821)	5 years ago
trending_tags_spec.rb	Change trending hashtags to not disappear instantly after midnight (#11712)	5 years ago
user_invite_request_spec.rb	…
user_spec.rb	…