mastodon/app/services
Claire aec61a703f Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how docker images were built, including how
  they were cached.
  I don't know much about it, so applied upstream's changes.
- `app/controllers/admin/domain_blocks_controller.rb`:
  The feature, that was in glitch-soc, got backported upstream.
  It also had a few fixes upstream, so those have been ported!
- `app/javascript/packs/admin.js`:
  Glitch-soc changes have been backported upstream. As a result,
  some code from `app/javascript/core/admin.js` got added upstream.
  Kept our version since our shared Javascript already has that feature.
- `app/models/user.rb`:
  Upstream added something to distinguish unusable and unusable-because-moved
  accounts, while glitch-soc considers moved accounts usable.
  Took upstream's code for `functional_or_moved?` and made `functional?`
  call it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream cleaned up code style a bit, on a line that we had custom changes
  for.
  Applied upstream's change while keeping our change.
- `config/initializers/content_security_policy.rb`:
  Upstream adopted one CSP directive we already had.
  The conflict is because of our files being structurally different, but the
  change itself was already part of glitch-soc.
  Kept our version.
2022-11-17 12:01:37 +01:00
..
activitypub Fix NameError in Webfinger redirect handling in ActivityPub::FetchRemoteActorService (#20260) 2022-11-09 20:10:38 +01:00
concerns
keys
account_search_service.rb Improve performance by avoiding regex construction (#20215) 2022-11-10 05:49:30 +01:00
account_statuses_cleanup_service.rb Fix reblogs being discarded after the reblogged status (#19731) 2022-11-04 16:31:44 +01:00
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
base_service.rb
batched_remove_status_service.rb
block_domain_service.rb
block_service.rb
bootstrap_timeline_service.rb
clear_domain_media_service.rb
create_featured_tag_service.rb
delete_account_service.rb
deliver_to_device_service.rb
fan_out_on_write_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
favourite_service.rb
fetch_link_card_service.rb
fetch_oembed_service.rb
fetch_remote_status_service.rb
fetch_resource_service.rb
follow_service.rb
import_service.rb Support UTF-8 Characters in Domains During CSV Import (#20592) 2022-11-14 05:52:13 +01:00
move_service.rb
mute_service.rb
notify_service.rb
post_status_service.rb
precompute_feed_service.rb
process_hashtags_service.rb
process_mentions_service.rb Change mentions of blocked users to not be processed (#19725) 2022-11-04 13:19:12 +01:00
purge_domain_service.rb
reblog_service.rb
reject_follow_service.rb
remove_featured_tag_service.rb
remove_from_followers_service.rb
remove_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
report_service.rb Change Report category to "violation" if rule IDs are provided (#20137) 2022-11-08 17:28:02 +01:00
resolve_account_service.rb Fix account migration form ever using outdated account data (#18429) 2022-10-29 01:31:45 +02:00
resolve_url_service.rb Improve performance by avoiding regex construction (#20215) 2022-11-10 05:49:30 +01:00
search_service.rb
suspend_account_service.rb
tag_search_service.rb
translate_status_service.rb
unallow_domain_service.rb
unblock_domain_service.rb
unblock_service.rb
unfavourite_service.rb
unfollow_service.rb
unmute_service.rb
unsuspend_account_service.rb
update_account_service.rb Fix being able to spoof link verification (#20217) 2022-11-09 08:24:21 +01:00
update_status_service.rb
verify_link_service.rb Handle links with no href in VerifyLinkService (#20741) 2022-11-17 10:59:35 +01:00
vote_service.rb
webhook_service.rb