OpenSource/mastodon
OpenSource/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-25 16:05:34 +01:00
Code Issues Projects Releases Packages Wiki Activity
mastodon/app/services
History
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
..
activitypub Use Enumerable#filter_map in more places (#15527) 2021-01-22 16:28:15 +01:00
concerns Fix activity not being signed (#13948) 2020-06-03 08:33:30 +02:00
keys Fix rubocop config and warnings (#15503) 2021-01-07 09:40:55 +01:00
account_search_service.rb Optimize some regex matching (#15528) 2021-01-22 10:09:08 +01:00
after_block_domain_from_account_service.rb Fix account domain block not properly unfollowing accounts from domain (#14304) 2020-07-13 19:33:10 +02:00
after_block_service.rb Refactor feed manager (#14761) 2020-09-08 03:41:16 +02:00
after_unallow_domain_service.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
app_sign_up_service.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
authorize_follow_service.rb
backup_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
base_service.rb
batched_remove_status_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
block_domain_service.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
block_service.rb
bootstrap_timeline_service.rb
clear_domain_media_service.rb Make domain block/silence/reject-media code more robust (#13424) 2020-06-09 10:32:00 +02:00
delete_account_service.rb Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
deliver_to_device_service.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
fan_out_on_write_service.rb Fix DMs not appearing into timelines (#15182) 2020-11-19 00:23:46 +01:00
favourite_service.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
fetch_link_card_service.rb Fix URL scanning in note length validator and preview card fetching (#15827) 2021-03-04 00:12:26 +01:00
fetch_oembed_service.rb Fix YouTube embeds failing due to YouTube serving wrong OEmbed URLs (#15716) 2021-02-12 05:45:38 +01:00
fetch_remote_status_service.rb
fetch_resource_service.rb
follow_service.rb Change ResolveAccountService's handling of skip_webfinger (#15750) 2021-02-24 06:32:13 +01:00
import_service.rb Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
move_service.rb
mute_service.rb Add duration parameter to muting. (#13831) 2020-10-13 01:01:14 +02:00
notify_service.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
post_status_service.rb
precompute_feed_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00
process_hashtags_service.rb
process_mentions_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
reblog_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
reject_follow_service.rb
remove_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
report_service.rb Fix reports of already suspended accounts being recorded (#16047) 2021-04-16 22:01:05 +02:00
resolve_account_service.rb Change ResolveAccountService's handling of skip_webfinger (#15750) 2021-02-24 06:32:13 +01:00
resolve_url_service.rb Improve searching for private toots from URL (#14856) 2020-12-17 06:51:49 +01:00
search_service.rb Optimize some regex matching (#15528) 2021-01-22 10:09:08 +01:00
suspend_account_service.rb Fix remote reporters not receiving suspend/unsuspend activities (#16050) 2021-04-17 14:55:46 +02:00
tag_search_service.rb
unallow_domain_service.rb Fix removing allowed domains being done synchronously (#14302) 2020-07-15 21:08:19 +02:00
unblock_domain_service.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
unblock_service.rb
unfavourite_service.rb
unfollow_service.rb
unmute_service.rb
unsuspend_account_service.rb Fix remote reporters not receiving suspend/unsuspend activities (#16050) 2021-04-17 14:55:46 +02:00
update_account_service.rb Bump rubocop from 0.86.0 to 0.88.0 (#14412) 2020-09-01 03:04:00 +02:00
verify_link_service.rb
vote_service.rb