fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-29 03:53:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/services
History
Claire 24e83246f9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream updated media and edit-related code textually close to glitch-soc
  additions (local-only and content-type).
  Ported upstream changes.
- `app/models/status_edit.rb`:
  Upstream changes textually close to glitch-soc additions (content-type).
  Ported upstream changes.
- `app/serializers/activitypub/note_serializer.rb`:
  Upstream changed how media attachments are handled. Not really a conflict,
  but textually close to glitch-soc additions (directMessage attribute).
  Ported upstream changes.
- `app/services/remove_status_service.rb`:
  Upstream changed how media attachments are handled. Not really a conflict,
  but textually close to glitch-soc additions (DM timeline).
  Ported upstream changes.
- `app/services/update_status_service.rb`:
  Upstream fixed an issue with language selection. Not really a conflict,
  but textually close to glitch-soc additions (content-type).
  Ported upstream changes.
- `db/schema.rb`:
  Upstream added columns to the `status_edits` table, the conflict is because
  of an additional column (`content-type`) in glitch-soc.
  Ported upstream changes.
- `package.json`:
  Upstream dependency (express) textually adjacent to a glitch-soc-specific one
  (favico.js) got updated.
  Updated it as well.
2022-03-10 09:52:45 +01:00
..
activitypub Add rate limit for editing (#17728) 2022-03-09 20:06:51 +01:00
concerns Fix deletes not being signed in authorized fetch mode (#17484) 2022-02-11 14:52:45 +01: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
account_statuses_cleanup_service.rb Fix Sidekiq warnings about JSON serialization (#17381) 2022-01-28 00:43:56 +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 Fix blocking someone not clearing up list feeds (#16205) 2021-05-10 17:31:55 +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
appeal_service.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
approve_appeal_service.rb Add ability to mark statuses as sensitive from reports in admin UI (#17668) 2022-03-01 22:20:29 +01:00
authorize_follow_service.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
backup_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-07-25 12:48:48 +02:00
base_service.rb
batched_remove_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-19 18:51:41 +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 Fix BlockService trying to reject incorrect follow request (#11288) 2019-07-15 00:48:50 +02:00
bootstrap_timeline_service.rb Fix duplicate notifications being possible after poll expiration (#17697) 2022-03-04 01:06:33 +01:00
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 Add trending statuses (#17431) 2022-02-25 00:34:14 +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 Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
favourite_service.rb Fix duplicate notifications being possible after poll expiration (#17697) 2022-03-04 01:06:33 +01:00
fetch_link_card_service.rb Fix various typos (#17621) 2022-02-22 20:14:17 +01:00
fetch_oembed_service.rb Fix some link previews being incorrectly generated from other prior links (#16885) 2021-10-21 20:39:35 +02:00
fetch_remote_status_service.rb Fix an error when ActivityPub::FetchRemoteStatusService url is called with nil (#12652) 2019-12-18 16:54:03 +01:00
fetch_resource_service.rb Fix not being able to resolve public resources in development environment (#13505) 2020-04-25 22:01:08 +02:00
follow_service.rb Fix Sidekiq warnings about JSON serialization (#17381) 2022-01-28 00:43:56 +01:00
import_service.rb Fix Sidekiq warnings about JSON serialization (#17381) 2022-01-28 00:43:56 +01:00
move_service.rb Fix account migration not affecting followers on origin server (#11980) 2019-09-29 16:23:13 +02:00
mute_service.rb Add duration parameter to muting. (#13831) 2020-10-13 01:01:14 +02:00
notify_service.rb Add notifications for new sign-ups (#16953) 2022-02-23 16:45:22 +01:00
post_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
precompute_feed_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00
process_hashtags_service.rb Add editing for published statuses (#17320) 2022-02-10 00:15:30 +01:00
process_mentions_service.rb Add support for editing for published statuses (#16697) 2022-01-19 22:37:27 +01:00
purge_domain_service.rb Remove custom emojis on domain purge (#17210) 2021-12-30 08:41:09 +01:00
reblog_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
reject_follow_service.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
remove_from_followers_service.rb Add remove from followers api (#16864) 2021-10-18 12:02:35 +02:00
remove_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
report_service.rb Fix report category not being saved in REST API (#17682) 2022-03-02 18:57:08 +01:00
resolve_account_service.rb Fix Sidekiq warnings about JSON serialization (#17381) 2022-01-28 00:43:56 +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 Add exclude_unreviewed param to GET /api/v2/search REST API (#11977) 2019-09-28 01:02:21 +02:00
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 Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
unfavourite_service.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
unfollow_service.rb Fix Move handler queuing jobs that will fail if account is suspended (#11864) 2019-09-17 08:44:45 +02:00
unmute_service.rb
unsuspend_account_service.rb Fix remotely-suspended accounts' toots being merged back into timelines (#16628) 2021-08-20 07:40:33 +01:00
update_account_service.rb Bump rubocop from 0.86.0 to 0.88.0 (#14412) 2020-09-01 03:04:00 +02:00
update_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
verify_link_service.rb
vote_service.rb Fix invalid votes from the API being accepted (#12601) 2020-01-12 14:17:03 +01:00