Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.		2022-01-17 10:45:25 +01:00
..
account_suggestions
admin
concerns
form	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
trends
web
account.rb
account_alias.rb
account_conversation.rb
account_deletion_request.rb
account_domain_block.rb
account_filter.rb
account_migration.rb
account_moderation_note.rb
account_note.rb
account_pin.rb
account_stat.rb
account_statuses_cleanup_policy.rb
account_suggestions.rb
account_summary.rb
account_warning.rb
account_warning_preset.rb
admin.rb
announcement.rb
announcement_filter.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
announcement_mute.rb
announcement_reaction.rb
application_record.rb
backup.rb
block.rb
bookmark.rb	Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915)	2021-11-18 22:02:08 +01:00
canonical_email_block.rb
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb
custom_emoji_category.rb
custom_emoji_filter.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
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	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
list.rb
list_account.rb	Add abilityto add oneself to lists (#12271)	2019-11-04 13:02:01 +01:00
list_feed.rb	Fix rubocop config and warnings (#15503)	2021-01-07 09:40:55 +01:00
login_activity.rb
marker.rb
media_attachment.rb
mention.rb
message_franking.rb
mute.rb
notification.rb	Prepare Mastodon for Rails 6 (#15911)	2021-03-17 10:09:55 +01:00
one_time_key.rb
poll.rb
poll_vote.rb
preview_card.rb
preview_card_filter.rb
preview_card_provider.rb
preview_card_provider_filter.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
status_pin.rb
status_stat.rb
system_key.rb
tag.rb
tag_feed.rb
tag_filter.rb
tombstone.rb
trends.rb
unavailable_domain.rb
user.rb
user_invite_request.rb	Add "why do you want to join" field to invite requests (#10524)	2019-04-09 23:06:30 +09:00
user_ip.rb
web.rb
webauthn_credential.rb