mastodon/app/models
Claire 44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README
2023-08-11 22:15:41 +02:00
..
account
account_suggestions
admin
concerns
form
trends
user_settings
web
account.rb
account_alias.rb Fix Style/SlicingWithRange cop (#25923) 2023-07-12 10:03:06 +02:00
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_statuses_filter.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
appeal.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
bulk_import.rb Add support for importing lists (#25203) 2023-06-01 14:47:31 +02:00
bulk_import_row.rb
canonical_email_block.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
content_retention_policy.rb
context.rb
conversation.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
conversation_mute.rb
custom_emoji.rb
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb
custom_filter_keyword.rb
custom_filter_status.rb
device.rb
direct_feed.rb
domain_allow.rb
domain_block.rb
email_domain_block.rb
encrypted_message.rb
export.rb
extended_description.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 Fix error when passing unknown filter param in REST API (#20626) 2022-11-14 08:06:06 +01:00
invite.rb
invite_filter.rb
ip_block.rb
list.rb
list_account.rb
list_feed.rb
login_activity.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
marker.rb
media_attachment.rb Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02:00
mention.rb
message_franking.rb
mute.rb
notification.rb
one_time_key.rb
poll.rb
poll_vote.rb
preview_card.rb
preview_card_provider.rb
preview_card_trend.rb
privacy_policy.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_edit.rb
status_pin.rb
status_stat.rb
status_trend.rb
system_key.rb
tag.rb
tag_feed.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
tag_follow.rb
tombstone.rb
translation.rb Translate CW, poll options and media descriptions (#24175) 2023-06-01 00:10:21 +02:00
trends.rb
unavailable_domain.rb
user.rb
user_invite_request.rb
user_ip.rb
user_role.rb
user_settings.rb
web.rb
webauthn_credential.rb
webhook.rb