mastodon/app/models
Claire 954e052b07 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/media_attachment.rb`:
  Upstream moved hardcoded values around, while in glitch-soc they are
  configurable.
  Moved them like upstream, but keeping glitch-soc's ability to configure
  them through env vars.
2022-02-22 18:06:29 +01:00
..
account_suggestions Fix error in suggestions API due to typo (#17486) 2022-02-08 22:23:04 +01:00
admin Add appeals (#17364) 2022-02-14 21:27:53 +01:00
concerns Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
form Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
trends Change reblogs to not count towards hashtag trends anymore (#17501) 2022-02-11 21:16:23 +01:00
web
account.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
account_alias.rb
account_conversation.rb
account_deletion_request.rb
account_domain_block.rb
account_filter.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
account_migration.rb
account_moderation_note.rb
account_note.rb
account_pin.rb
account_stat.rb
account_statuses_cleanup_policy.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
account_suggestions.rb
account_summary.rb Fix FollowRecommendationsScheduler failing because of unpopulated views (#16189) 2021-05-09 10:39:29 +02:00
account_warning.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
account_warning_preset.rb
admin.rb
announcement.rb
announcement_filter.rb
announcement_mute.rb
announcement_reaction.rb
appeal.rb Fix issues when attempting to appeal an old strike (#17554) 2022-02-16 22:29:48 +01:00
application_record.rb
backup.rb
block.rb
bookmark.rb
canonical_email_block.rb Add ability for admins to delete canonical email blocks (#16644) 2021-12-17 23:02:14 +01:00
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb
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 Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
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 Fix follow limit preventing re-following of a moved account (#14207) 2020-12-18 09:18:31 +01:00
instance.rb
instance_filter.rb
invite.rb
invite_filter.rb
ip_block.rb
list.rb
list_account.rb
list_feed.rb
login_activity.rb
marker.rb
media_attachment.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-02-22 18:06:29 +01:00
mention.rb
message_franking.rb
mute.rb
notification.rb Add notifications when a reblogged status has been updated (#17404) 2022-02-11 22:20:19 +01:00
one_time_key.rb
poll.rb Fix poll votes not being properly reset on poll change (#17498) 2022-02-10 14:26:54 +01:00
poll_vote.rb Add optimistic lock to avoid race conditions when handling votes (#10196) 2019-03-06 19:53:57 +01:00
preview_card.rb Fix error on trending hashtags/links pages in admin UI due to missing constant (#17044) 2021-11-26 01:12:39 +01:00
preview_card_filter.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
preview_card_provider.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
preview_card_provider_filter.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
public_feed.rb
relationship_filter.rb
relay.rb
remote_follow.rb
report.rb Add category and rule_ids params to POST /api/v1/reports (#17492) 2022-02-10 00:10:16 +01:00
report_filter.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
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 2022-02-12 11:12:41 +01:00
status_edit.rb Add content_type to status_edits 2022-02-09 18:02:31 +01:00
status_pin.rb
status_stat.rb
system_key.rb
tag.rb Fix error on trending hashtags/links pages in admin UI due to missing constant (#17044) 2021-11-26 01:12:39 +01:00
tag_feed.rb
tag_filter.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
tombstone.rb Record deleted(by mod) status to prevent re-appear (#10732) 2019-05-09 22:03:02 +02:00
trends.rb Disable trending links review request emails 2021-11-25 23:55:05 +01:00
unavailable_domain.rb
user.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
user_invite_request.rb
user_ip.rb Remove IP tracking columns from users table (#16409) 2022-01-16 13:23:50 +01:00
web.rb Add extended about page stub 2017-01-13 03:24:41 +01:00
webauthn_credential.rb