mastodon/app/models
Claire 4415005de7 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict caused because of minor code style change upstream, while glitch-soc
  has different code for handling variable maximum chars.
  Ported the change.
- `app/serializers/initial_state_serializer.rb`:
  Conflict because glitch-soc had two extra attributes where upstream added
  one.
  Added upstream's attribute.
2022-05-16 22:29:05 +02:00
..
account_suggestions Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
admin Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
concerns Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00
form Add confirmation page when importing blocked domains (#1773) 2022-05-16 18:26:49 +02:00
trends Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
web Add policy param to POST /api/v1/push/subscriptions (#16040) 2021-04-15 05:00:25 +02:00
account.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-04-27 08:48:21 +02:00
account_alias.rb Fix crash in alias settings page (#18004) 2022-04-09 20:11:06 +02:00
account_conversation.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
account_deletion_request.rb
account_domain_block.rb
account_filter.rb Fix /api/v1/admin/accounts (#17887) 2022-03-28 23:57:38 +02:00
account_migration.rb Refactor how Redis locks are created (#18400) 2022-05-13 00:02:35 +02:00
account_moderation_note.rb
account_note.rb Fix AccountNote not having a maximum length (#16942) 2021-11-06 00:12:25 +01:00
account_pin.rb
account_stat.rb Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915) 2021-11-18 22:02:08 +01:00
account_statuses_cleanup_policy.rb Add option to automatically delete toots after one week (#17691) 2022-03-03 16:18:58 +01:00
account_statuses_filter.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
account_suggestions.rb Change auto-following admin-selected accounts, show in recommendations (#16078) 2021-04-24 17:01:43 +02:00
account_summary.rb Fix FollowRecommendationsScheduler failing because of unpopulated views (#16189) 2021-05-09 10:39:29 +02:00
account_warning.rb Add ability to mark statuses as sensitive from reports in admin UI (#17668) 2022-03-01 22:20:29 +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 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 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 Merge branch 'main' into glitch-soc/merge-upstream 2021-09-30 00:01:20 +02:00
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
device.rb
direct_feed.rb
domain_allow.rb Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
domain_block.rb Fix a type error in domain_block policies (#17735) 2022-03-10 04:10:20 +01:00
email_domain_block.rb Remove IP matching from e-mail domain blocks (#18190) 2022-04-29 23:27:03 +02:00
encrypted_message.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
export.rb
favourite.rb Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915) 2021-11-18 22:02:08 +01:00
featured_tag.rb Fix data integrity of featured tags (#17712) 2022-03-09 08:51:12 +01:00
feed.rb
follow.rb
follow_recommendation.rb Fix FollowRecommendationsScheduler failing because of unpopulated views (#16189) 2021-05-09 10:39:29 +02:00
follow_recommendation_filter.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
follow_recommendation_suppression.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
follow_request.rb Fix edge case where accepted follow cannot be processed because of follow limit (#16098) 2021-04-23 22:51:21 +02:00
home_feed.rb Revert support from loading Home timeline from database 2022-04-19 15:06:38 +02:00
identity.rb
import.rb
instance.rb Fix nil error when viewing suspended domain in admin UI (#17765) 2022-03-14 05:27:37 +01:00
instance_filter.rb Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01:00
invite.rb
invite_filter.rb
ip_block.rb
list.rb
list_account.rb
list_feed.rb
login_activity.rb Add authentication history (#16408) 2021-06-21 17:07:30 +02:00
marker.rb
media_attachment.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
mention.rb
message_franking.rb
mute.rb
notification.rb Add types param to GET /api/v1/notifications in REST API (#17767) 2022-03-15 04:11:29 +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
preview_card.rb Fix individually approved/rejected statuses/links showing as pending review (#17787) 2022-03-15 07:51:55 +01:00
preview_card_provider.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 Change how changes to media attachments are stored for edits (#17696) 2022-03-09 09:06:17 +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 Add Ruby 3.0 support (#16046) 2021-05-06 14:22:54 +02:00
setting.rb
site_upload.rb
status.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
status_edit.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
status_pin.rb Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
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
tombstone.rb
trends.rb Fix setting for trending tags and trending links notifications being swapped (#1771) 2022-05-13 22:57:47 +02:00
unavailable_domain.rb
user.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 22:29:05 +02: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
webauthn_credential.rb