mastodon/app/models
Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
  Not really a conflict, upstream change (removing the spam checker) too close
  to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
  Same.
- `app/services/remove_status_service.rb`:
  Same.
- `app/views/admin/settings/edit.html.haml`:
  Same.
- `config/settings.yml`:
  Same.
- `config/environments/production.rb`:
  Not a real conflict, upstream added a default HTTP header, but we have
  extra headers in glitch-soc.
  Added the header.
2021-04-20 12:17:14 +02:00
..
admin Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
concerns Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
form Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +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 2021-04-20 12:17:14 +02:00
account_alias.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00
account_conversation.rb allow pagination by min_id and max_id (#14776) 2020-09-12 17:09:49 +02:00
account_deletion_request.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
account_domain_block.rb
account_filter.rb Fix admins being able to suspend their instance actor (#14567) 2020-12-15 17:23:58 +01:00
account_identity_proof.rb
account_migration.rb Fix race conditions on account migration creation (#15597) 2021-02-02 14:49:57 +01:00
account_moderation_note.rb
account_note.rb Add user notes on accounts (#14148) 2020-06-30 19:19:50 +02:00
account_pin.rb
account_stat.rb Improve account counters handling (#15913) 2021-03-19 13:14:57 +01:00
account_suggestions.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
account_summary.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
account_tag_stat.rb
account_warning.rb Add account sensitized (#14361) 2020-11-04 20:45:01 +01:00
account_warning_preset.rb
admin.rb
announcement.rb Change order of announcements in admin page to sort them newest-first (#15091) 2020-11-04 21:15:22 +01:00
announcement_filter.rb
announcement_mute.rb
announcement_reaction.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
canonical_email_block.rb Add canonical e-mail blocks for suspended accounts (#16049) 2021-04-17 03:14:25 +02:00
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb Add separate cache directory for non-local uploads (#12821) 2020-04-26 23:29:08 +02:00
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb Optimize map { ... }.compact calls (#15513) 2021-01-10 00:32:01 +01:00
device.rb Add E2EE API (#13820) 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 (#15282) 2020-12-14 09:06:34 +01:00
domain_block.rb Add option to obfuscate domain name in public list of domain blocks (#15355) 2020-12-18 08:30:41 +01:00
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 Add import/export feature for bookmarks (#14956) 2020-11-19 17:48:13 +01:00
favourite.rb Fix unnecessary queries when batch-removing statuses, 100x faster (#15387) 2020-12-22 17:13:55 +01:00
featured_tag.rb
feed.rb allow pagination by min_id and max_id (#14776) 2020-09-12 17:09:49 +02:00
follow.rb Fix being able to import more than allowed number of follows (#15384) 2020-12-26 23:52:46 +01:00
follow_recommendation.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
follow_recommendation_filter.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
follow_recommendation_suppression.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
follow_request.rb Fix being able to import more than allowed number of follows (#15384) 2020-12-26 23:52:46 +01:00
home_feed.rb Fix rubocop config and warnings (#15503) 2021-01-07 09:40:55 +01:00
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 Fix performance on instances list in admin UI (#15282) 2020-12-14 09:06:34 +01:00
instance_filter.rb Fix performance on instances list in admin UI (#15282) 2020-12-14 09:06:34 +01:00
invite.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
invite_filter.rb
ip_block.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
list.rb Improve account deletion performances further (#15407) 2020-12-22 23:57:46 +01:00
list_account.rb
list_feed.rb Fix rubocop config and warnings (#15503) 2021-01-07 09:40:55 +01:00
marker.rb
media_attachment.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-02-12 10:28:32 +01:00
mention.rb
message_franking.rb Add E2EE API (#13820) 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 (#15911) 2021-03-17 10:09:55 +01:00
one_time_key.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
poll.rb Fix rubocop config and warnings (#15503) 2021-01-07 09:40:55 +01:00
poll_vote.rb
preview_card.rb Bump rubocop from 0.86.0 to 0.88.0 (#14412) 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 #13538 (#13676) 2020-05-08 20:17:16 +02:00
relay.rb Fix enable/disable relay failures (#13535) 2020-04-23 22:04:18 +02:00
remote_follow.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00
report.rb Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
report_filter.rb
report_note.rb
rule.rb Add server rules (#15769) 2021-02-21 19:50:12 +01:00
scheduled_status.rb
search.rb
session_activation.rb Fix streaming API allowing connections to persist after access token invalidation (#15111) 2020-11-12 23:05:24 +01:00
setting.rb Use Rails' index_by where it makes sense (#15542) 2021-01-12 09:27:38 +01:00
site_upload.rb
status.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-02-03 17:02:48 +01:00
status_pin.rb
status_stat.rb
system_key.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
tag.rb Fix possible inconsistencies in tag search (#14906) 2020-11-12 18:35:23 +01:00
tag_feed.rb Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
tag_filter.rb
tombstone.rb
trending_tags.rb Use Rails' index_by where it makes sense (#15542) 2021-01-12 09:27:38 +01:00
unavailable_domain.rb Fix performance on instances list in admin UI (#15282) 2020-12-14 09:06:34 +01:00
user.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-03-24 10:53:50 +01:00
user_invite_request.rb
web.rb
webauthn_credential.rb Fix validates :sign_count of WebauthnCredential (#14806) 2020-09-16 20:16:46 +02:00