Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream ... - `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.		2021-05-07 18:21:59 +02:00
..
account_suggestions
admin
concerns
form	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
web
account.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
account_alias.rb
account_conversation.rb
account_deletion_request.rb
account_domain_block.rb
account_filter.rb
account_identity_proof.rb
account_migration.rb
account_moderation_note.rb
account_note.rb
account_pin.rb
account_stat.rb
account_suggestions.rb
account_summary.rb
account_warning.rb
account_warning_preset.rb
admin.rb
announcement.rb
announcement_filter.rb
announcement_mute.rb
announcement_reaction.rb
application_record.rb	Fix records not being indexed sometimes (#12024)	2019-10-01 01:19:11 +02:00
backup.rb
block.rb
bookmark.rb
canonical_email_block.rb
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb	Add environment variables to control custom emoji size limits	2021-04-26 11:22:22 +02:00
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb
device.rb
direct_feed.rb
domain_allow.rb
domain_block.rb
email_domain_block.rb
encrypted_message.rb
export.rb
favourite.rb
featured_tag.rb
feed.rb
follow.rb
follow_recommendation.rb
follow_recommendation_filter.rb
follow_recommendation_suppression.rb
follow_request.rb
home_feed.rb
identity.rb
import.rb
instance.rb
instance_filter.rb
invite.rb
invite_filter.rb
ip_block.rb
list.rb
list_account.rb
list_feed.rb
marker.rb
media_attachment.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
mention.rb
message_franking.rb
mute.rb
notification.rb
one_time_key.rb
poll.rb	Fix rubocop config and warnings (#15503)	2021-01-07 09:40:55 +01:00
poll_vote.rb
preview_card.rb
public_feed.rb
relationship_filter.rb
relay.rb
remote_follow.rb
report.rb
report_filter.rb
report_note.rb
rule.rb
scheduled_status.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
status_pin.rb
status_stat.rb
system_key.rb
tag.rb
tag_feed.rb
tag_filter.rb
tombstone.rb
trending_tags.rb
unavailable_domain.rb
user.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
user_invite_request.rb
web.rb
webauthn_credential.rb