1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-19 07:57:00 +00:00
mastodon/app/models
Claire cdf20f4367 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/rest/instance_serializer.rb`:
  Upstream changed the fields returned by /api/v1/instance by adding a
  `configuration` field holding a lot of useful information making our
  `max_toot_chars` and `poll_limits` fields obsolete.
  Keeping those around for now for compatibility.
- `app/validators/status_length_validator.rb`:
  No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to
  MAX_CHARS which is defined differently in glitch-soc.
  Ported upstream changes.
2021-07-11 21:41:23 +02:00
..
account_suggestions Change auto-following admin-selected accounts, show in recommendations () 2021-04-24 17:01:43 +02:00
admin Add management of delivery availability in Federation settings () 2021-05-05 23:39:02 +02:00
concerns Add authentication history () 2021-06-21 17:07:30 +02:00
form Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
web Add policy param to POST /api/v1/push/subscriptions () 2021-04-15 05:00:25 +02:00
account.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-07-02 16:12:11 +02:00
account_alias.rb Remove dependency on goldfinger gem () 2020-10-08 00:34:57 +02:00
account_conversation.rb allow pagination by min_id and max_id () 2020-09-12 17:09:49 +02:00
account_deletion_request.rb Change account suspensions to be reversible by default () 2020-09-15 14:37:58 +02:00
account_domain_block.rb
account_filter.rb Fix admins being able to suspend their instance actor () 2020-12-15 17:23:58 +01:00
account_identity_proof.rb
account_migration.rb Fix race conditions on account migration creation () 2021-02-02 14:49:57 +01:00
account_moderation_note.rb
account_note.rb Add user notes on accounts () 2020-06-30 19:19:50 +02:00
account_pin.rb
account_stat.rb Fix upgrade path from 3.4.0 () 2021-07-07 21:13:30 +02:00
account_suggestions.rb Change auto-following admin-selected accounts, show in recommendations () 2021-04-24 17:01:43 +02:00
account_summary.rb Fix FollowRecommendationsScheduler failing because of unpopulated views () 2021-05-09 10:39:29 +02:00
account_warning.rb Add account sensitized () 2020-11-04 20:45:01 +01:00
account_warning_preset.rb Add titles to warning presets in admin UI () 2020-03-12 17:57:59 +01:00
admin.rb
announcement.rb Change order of announcements in admin page to sort them newest-first () 2020-11-04 21:15:22 +01:00
announcement_filter.rb Add announcements () 2020-01-23 22:00:13 +01:00
announcement_mute.rb Add announcements () 2020-01-23 22:00:13 +01:00
announcement_reaction.rb Add announcements () 2020-01-23 22:00:13 +01:00
application_record.rb
backup.rb Add announcements () 2020-01-23 22:00:13 +01:00
block.rb
bookmark.rb Add announcements () 2020-01-23 22:00:13 +01:00
canonical_email_block.rb Add canonical e-mail blocks for suspended accounts () 2021-04-17 03:14:25 +02:00
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb Add environment variables to control custom emoji size limits 2021-04-26 11:22:22 +02:00
custom_emoji_category.rb
custom_emoji_filter.rb Various fixes and improvements () 2020-01-20 15:55:03 +01:00
custom_filter.rb Optimize map { ... }.compact calls () 2021-01-10 00:32:01 +01:00
device.rb Add E2EE API () 2020-06-02 19:24:53 +02:00
direct_feed.rb Fix DM timeline failing to load from database 2021-03-12 23:17:34 +01:00
domain_allow.rb Fix performance on instances list in admin UI () 2020-12-14 09:06:34 +01:00
domain_block.rb Add option to obfuscate domain name in public list of domain blocks () 2020-12-18 08:30:41 +01:00
email_domain_block.rb Add option to include resolved DNS records when blacklisting e-mail domains in admin UI () 2020-03-12 22:35:20 +01:00
encrypted_message.rb Change Redis#exists calls to Redis#exists? to avoid deprecation warning () 2020-07-01 19:05:21 +02:00
export.rb Add import/export feature for bookmarks () 2020-11-19 17:48:13 +01:00
favourite.rb Fix unnecessary queries when batch-removing statuses, 100x faster () 2020-12-22 17:13:55 +01:00
featured_tag.rb
feed.rb allow pagination by min_id and max_id () 2020-09-12 17:09:49 +02:00
follow.rb Fix being able to import more than allowed number of follows () 2020-12-26 23:52:46 +01:00
follow_recommendation.rb Fix FollowRecommendationsScheduler failing because of unpopulated views () 2021-05-09 10:39:29 +02:00
follow_recommendation_filter.rb Add cold-start follow recommendations () 2021-04-12 12:37:14 +02:00
follow_recommendation_suppression.rb Add cold-start follow recommendations () 2021-04-12 12:37:14 +02:00
follow_request.rb Fix edge case where accepted follow cannot be processed because of follow limit () 2021-04-23 22:51:21 +02:00
home_feed.rb Fix rubocop config and warnings () 2021-01-07 09:40:55 +01:00
identity.rb
import.rb Fix follow limit preventing re-following of a moved account () 2020-12-18 09:18:31 +01:00
instance.rb Add management of delivery availability in Federation settings () 2021-05-05 23:39:02 +02:00
instance_filter.rb Add management of delivery availability in Federation settings () 2021-05-05 23:39:02 +02:00
invite.rb Change account suspensions to be reversible by default () 2020-09-15 14:37:58 +02:00
invite_filter.rb Various fixes and improvements () 2020-01-20 15:55:03 +01:00
ip_block.rb Add IP-based rules () 2020-10-12 16:33:49 +02:00
list.rb Improve account deletion performances further () 2020-12-22 23:57:46 +01:00
list_account.rb
list_feed.rb Fix rubocop config and warnings () 2021-01-07 09:40:55 +01:00
login_activity.rb Add authentication history () 2021-06-21 17:07:30 +02:00
marker.rb
media_attachment.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
mention.rb
message_franking.rb Add E2EE API () 2020-06-02 19:24:53 +02:00
mute.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
notification.rb Prepare Mastodon for Rails 6 () 2021-03-17 10:09:55 +01:00
one_time_key.rb Add E2EE API () 2020-06-02 19:24:53 +02:00
poll.rb Fix rubocop config and warnings () 2021-01-07 09:40:55 +01:00
poll_vote.rb
preview_card.rb Bump rubocop from 0.86.0 to 0.88.0 () 2020-09-01 03:04:00 +02:00
public_feed.rb Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
relationship_filter.rb Fix followings list order | Issue () 2020-05-08 20:17:16 +02:00
relay.rb Fix enable/disable relay failures () 2020-04-23 22:04:18 +02:00
remote_follow.rb Remove dependency on goldfinger gem () 2020-10-08 00:34:57 +02:00
report.rb Update Mastodon to Rails 6.1 () 2021-03-24 10:44:31 +01:00
report_filter.rb Add ability to filter reports by origin of target account () 2021-07-11 11:01:38 +02:00
report_note.rb
rule.rb Add server rules () 2021-02-21 19:50:12 +01:00
scheduled_status.rb
search.rb
session_activation.rb Add Ruby 3.0 support () 2021-05-06 14:22:54 +02:00
setting.rb Use Rails' index_by where it makes sense () 2021-01-12 09:27:38 +01:00
site_upload.rb
status.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
status_pin.rb
status_stat.rb
system_key.rb Add E2EE API () 2020-06-02 19:24:53 +02:00
tag.rb Change trending hashtags to be affected be reblogs () 2021-05-07 14:33:43 +02:00
tag_feed.rb Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
tag_filter.rb Change trending hashtags to be affected be reblogs () 2021-05-07 14:33:43 +02:00
tombstone.rb
trending_tags.rb Change trending hashtags to be affected be reblogs () 2021-05-07 14:33:43 +02:00
unavailable_domain.rb Fix performance on instances list in admin UI () 2020-12-14 09:06:34 +01:00
user.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
user_invite_request.rb
web.rb
webauthn_credential.rb Fix validates :sign_count of WebauthnCredential () 2020-09-16 20:16:46 +02:00