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 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.		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	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
web	…
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
account_conversation.rb	…
account_domain_block.rb	Fix crash when saving invalid domain name (#11528)	5 years ago
account_filter.rb	…
account_identity_proof.rb	…
account_moderation_note.rb	…
account_pin.rb	…
account_stat.rb	Add more accurate account search (#11537)	5 years ago
account_tag_stat.rb	…
account_warning.rb	…
account_warning_preset.rb	…
admin.rb	…
application_record.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	5 years ago
backup.rb	…
block.rb	…
bookmark.rb	…
context.rb	…
conversation.rb	Revert "Remove conversation URI (#11423)" (#11424)	5 years ago
conversation_mute.rb	…
custom_emoji.rb	Remove WebP support (#11589)	5 years ago
custom_emoji_category.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	…
direct_feed.rb	…
domain_allow.rb	Fix crash when saving invalid domain name (#11528)	5 years ago
domain_block.rb	Add public blocks to /about/blocks (#11298)	5 years ago
email_domain_block.rb	Fix crash when saving invalid domain name (#11528)	5 years ago
export.rb	…
favourite.rb	…
featured_tag.rb	Fix featured tags not finding the right tag on save (#11504)	5 years ago
feed.rb	…
follow.rb	…
follow_request.rb	…
home_feed.rb	…
identity.rb	…
import.rb	…
instance.rb	Add whitelist mode (#11291)	5 years ago
instance_filter.rb	Add whitelist mode (#11291)	5 years ago
invite.rb	Add invite comments (#10465)	5 years ago
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mention.rb	…
mute.rb	…
notification.rb	…
poll.rb	…
poll_vote.rb	…
preview_card.rb	Remove WebP support (#11589)	5 years ago
relay.rb	…
remote_follow.rb	Fix acct URIs with IDN domains not being resolved (#11520)	5 years ago
report.rb	Add soft delete for statuses for instant deletes through API (#11623)	5 years ago
report_filter.rb	…
report_note.rb	…
scheduled_status.rb	…
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	…
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
status_pin.rb	…
status_stat.rb	…
tag.rb	Fix ignoring whole status because of one invalid hashtag (#11621)	5 years ago
tombstone.rb	…
trending_tags.rb	Add more accurate hashtag search (#11579)	5 years ago
user.rb	Add option to disable emoji replacements	5 years ago
user_invite_request.rb	…
web.rb	…