mastodon/app/services
Claire d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.
2023-05-08 19:28:21 +02:00
..
activitypub Fix Performance/DeletePrefix cop (#24796) 2023-05-02 21:07:45 +02:00
concerns
keys
account_search_service.rb
account_statuses_cleanup_service.rb
after_block_domain_from_account_service.rb
after_block_service.rb
after_unallow_domain_service.rb
app_sign_up_service.rb
appeal_service.rb
approve_appeal_service.rb
authorize_follow_service.rb
backup_service.rb Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
base_service.rb
batched_remove_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
block_domain_service.rb
block_service.rb
bootstrap_timeline_service.rb
bulk_import_row_service.rb Rewrite import feature (#21054) 2023-05-02 12:08:48 +02:00
bulk_import_service.rb Rewrite import feature (#21054) 2023-05-02 12:08:48 +02:00
clear_domain_media_service.rb
create_featured_tag_service.rb
delete_account_service.rb Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034) 2023-03-15 03:45:15 +01:00
deliver_to_device_service.rb
fan_out_on_write_service.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
favourite_service.rb
fetch_link_card_service.rb Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method (#24741) 2023-05-02 18:16:07 +02:00
fetch_oembed_service.rb Drop EOL Ruby 2.7 (#24237) 2023-04-27 01:46:18 +02:00
fetch_remote_status_service.rb
fetch_resource_service.rb Fix Performance/CollectionLiteralInLoop cop (#24819) 2023-05-04 05:33:55 +02:00
follow_migration_service.rb Fix various edge cases with local moves (#24812) 2023-05-03 19:19:25 +02:00
follow_service.rb
import_service.rb Rewrite import feature (#21054) 2023-05-02 12:08:48 +02:00
move_service.rb
mute_service.rb
notify_service.rb Fix crash in NotifyService when trying to send an email notification for polls (#24558) 2023-04-17 13:13:36 +02:00
post_status_service.rb Fix rubocop warnings (#2206) 2023-05-07 15:06:15 +02:00
precompute_feed_service.rb
process_hashtags_service.rb
process_mentions_service.rb
purge_domain_service.rb
reblog_service.rb
reject_follow_service.rb
remove_domains_from_followers_service.rb Fix “Remove all followers from the selected domains” being more destructive than it claims (#23805) 2023-03-03 20:25:15 +01:00
remove_featured_tag_service.rb
remove_from_followers_service.rb
remove_status_service.rb Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
report_service.rb
resolve_account_service.rb Fix Performance/DeletePrefix cop (#24796) 2023-05-02 21:07:45 +02:00
resolve_url_service.rb
search_service.rb Refactoring relations_map (#24195) 2023-03-21 10:32:58 +01:00
suspend_account_service.rb Fix Performance/CollectionLiteralInLoop cop (#24819) 2023-05-04 05:33:55 +02:00
tag_search_service.rb Fix Performance/DeletePrefix cop (#24796) 2023-05-02 21:07:45 +02:00
translate_status_service.rb Replace Status#translatable? with language matrix in separate endpoint (#24037) 2023-03-16 11:07:24 +01:00
unallow_domain_service.rb
unblock_domain_service.rb
unblock_service.rb
unfavourite_service.rb
unfollow_service.rb Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method (#24741) 2023-05-02 18:16:07 +02:00
unmute_service.rb
unsuspend_account_service.rb Fix Performance/CollectionLiteralInLoop cop (#24819) 2023-05-04 05:33:55 +02:00
update_account_service.rb Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034) 2023-03-15 03:45:15 +01:00
update_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +02:00
verify_link_service.rb
vote_service.rb Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method (#24741) 2023-05-02 18:16:07 +02:00
webhook_service.rb