Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb		2019-10-27 12:14:01 +01:00
..
admin
concerns
form
web
account.rb
account_alias.rb
account_conversation.rb
account_domain_block.rb
account_filter.rb
account_identity_proof.rb
account_migration.rb
account_moderation_note.rb
account_pin.rb
account_stat.rb
account_tag_stat.rb
account_warning.rb
account_warning_preset.rb
admin.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb
direct_feed.rb
domain_allow.rb
domain_block.rb
email_domain_block.rb
export.rb
favourite.rb	Fix records not being indexed sometimes (#12024)	2019-10-01 01:19:11 +02:00
featured_tag.rb
feed.rb
follow.rb
follow_request.rb
home_feed.rb
identity.rb
import.rb
instance.rb
instance_filter.rb
invite.rb
invite_filter.rb
list.rb
list_account.rb
list_feed.rb
marker.rb
media_attachment.rb
mention.rb	Improve support for aspects/circles (#8950)	2018-10-17 17:13:04 +02:00
mute.rb
notification.rb
poll.rb
poll_vote.rb
preview_card.rb
relay.rb
remote_follow.rb
report.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
report_filter.rb
report_note.rb
scheduled_status.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb
status_pin.rb
status_stat.rb
tag.rb
tag_filter.rb
tombstone.rb
trending_tags.rb
user.rb
user_invite_request.rb
web.rb