mastodon/app/models
Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
2023-07-30 16:11:55 +02:00
..
account
account_suggestions Fix Performance/MapCompact cop (#24797) 2023-05-23 10:49:12 +02:00
admin Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` (#25386) 2023-06-14 15:21:36 +02:00
concerns Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
form Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream 2023-06-10 15:17:08 +02:00
trends Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
user_settings
web
account.rb Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 2023-07-30 13:15:01 +02:00
account_alias.rb Fix `Style/SlicingWithRange` cop (#25923) 2023-07-12 10:03:06 +02:00
account_conversation.rb Fix /api/v1/conversations sometimes returning empty accounts (#25499) 2023-06-20 18:32:26 +02:00
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 Fix Performance/MapCompact cop (#24797) 2023-05-23 10:49:12 +02:00
account_statuses_filter.rb
account_suggestions.rb
account_summary.rb
account_warning.rb
account_warning_preset.rb
admin.rb
announcement.rb Rails 7.0 update (#25668) 2023-07-13 09:36:07 +02:00
announcement_filter.rb
announcement_mute.rb
announcement_reaction.rb
appeal.rb
application_record.rb Fix replica being used even if not explicitly defined (#26074) 2023-07-21 11:30:53 +02:00
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
content_retention_policy.rb
context.rb
conversation.rb
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 Autofix Rubocop Regex Style rules (#23690) 2023-06-06 14:50:51 +02:00
domain_block.rb Fix `Style/SlicingWithRange` cop (#25923) 2023-07-12 10:03:06 +02:00
email_domain_block.rb Fix `Style/SlicingWithRange` cop (#25923) 2023-07-12 10:03:06 +02:00
encrypted_message.rb
export.rb
extended_description.rb
favourite.rb
featured_tag.rb
feed.rb
follow.rb
follow_recommendation.rb
follow_recommendation_filter.rb Fix Performance/MapCompact cop (#24797) 2023-05-23 10:49:12 +02:00
follow_recommendation_suppression.rb
follow_request.rb
home_feed.rb
identity.rb Change Identity to not destroy associated User on destroy (#25098) 2023-05-23 15:00:36 +02:00
import.rb
instance.rb Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
instance_filter.rb
invite.rb
invite_filter.rb
ip_block.rb
list.rb Add exclusive lists (#22048) 2023-06-05 09:37:02 +02:00
list_account.rb
list_feed.rb
login_activity.rb
marker.rb
media_attachment.rb
mention.rb
message_franking.rb
mute.rb
notification.rb Rails 7.0 update (#25668) 2023-07-13 09:36:07 +02:00
one_time_key.rb
poll.rb
poll_vote.rb
preview_card.rb Add `published_at` attribute to preview cards (#26153) 2023-07-25 13:40:35 +02:00
preview_card_provider.rb Fix `Style/SlicingWithRange` cop (#25923) 2023-07-12 10:03:06 +02:00
preview_card_trend.rb
privacy_policy.rb
public_feed.rb
relationship_filter.rb
relay.rb
remote_follow.rb
report.rb Add report.updated webhook (#24211) 2023-07-24 17:37:38 +02:00
report_filter.rb
report_note.rb
rule.rb
scheduled_status.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb Autofix Rubocop Regex Style rules (#23690) 2023-06-06 14:50:51 +02:00
status.rb Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream 2023-07-13 22:40:15 +02:00
status_edit.rb
status_pin.rb
status_stat.rb
status_trend.rb
system_key.rb
tag.rb Autofix Rubocop Regex Style rules (#23690) 2023-06-06 14:50:51 +02:00
tag_feed.rb
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 Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream 2023-07-12 15:38:35 +02:00
unavailable_domain.rb
user.rb Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream 2023-07-12 15:38:35 +02:00
user_invite_request.rb
user_ip.rb
user_role.rb Fix Performance/MapCompact cop (#24797) 2023-05-23 10:49:12 +02:00
user_settings.rb Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
web.rb
webauthn_credential.rb
webhook.rb Add report.updated webhook (#24211) 2023-07-24 17:37:38 +02:00