queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/services
History
Thibaut Girka 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  No real conflict, glitch-soc-only dependency (redcarpet) too close to an
  upstream one (rdf-normalize)
- `README.md`:
  we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
  No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
  Upstream added code to keep bookmarked statuses, we were already doing so
  with slightly different code. Discarded upstream's changes.
- `package.json`:
  No real conflict, glitch-soc-only dependency (favico.js) too close to
  an upstream one
2020-01-12 15:57:34 +01:00
..
activitypub Clarify keyword arguments with ** (#12769) 2020-01-11 05:57:05 +09:00
concerns Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
account_search_service.rb Fix account search with no query (#12549) 2019-12-06 19:44:23 +01:00
after_block_domain_from_account_service.rb Change account domain block to clear out notifications and follows (#11393) 2019-07-25 04:17:35 +02:00
after_block_service.rb Change account domain block to clear out notifications and follows (#11393) 2019-07-25 04:17:35 +02:00
app_sign_up_service.rb Add reason param to POST /api/v1/accounts REST API (#12064) 2019-10-03 17:50:59 +02:00
authorize_follow_service.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
backup_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
base_service.rb
batched_remove_status_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
block_domain_service.rb Change domain block behavior to update user records before deleting data (#12247) 2019-11-21 11:36:15 +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 Admin setting to disable default follows (#12566) 2019-12-16 23:55:50 +01:00
fan_out_on_write_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
favourite_service.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
fetch_link_card_service.rb Fix link crawler not specifying accepted content-type (#12646) 2019-12-18 16:56:06 +01:00
fetch_oembed_service.rb Fix link crawler not specifying accepted content-type (#12646) 2019-12-18 16:56:06 +01: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 Use quality values in Accept field to explicitly prefer JSON over HTML (#12806) 2020-01-10 00:10:29 +01:00
follow_service.rb Fix various issues with account migration (#12301) 2019-11-07 09:05:07 +02:00
hashtag_query_service.rb Fix hashtag timeline REST API accepting too many hashtags (#12091) 2019-10-07 03:56:21 +02:00
import_service.rb
move_service.rb Fix account migration not affecting followers on origin server (#11980) 2019-09-29 16:23:13 +02:00
mute_service.rb
notify_service.rb Add follow_request notification type (#12198) 2019-12-01 17:25:29 +01:00
post_status_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
precompute_feed_service.rb Use a redis-cached feed for the DM timeline 2019-06-27 16:44:12 +02:00
process_hashtags_service.rb Change hashtags to preserve first-used casing (#11416) 2019-07-28 05:59:51 +02:00
process_mentions_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
reblog_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
reject_follow_service.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
remove_status_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
report_service.rb
resolve_account_service.rb Fix acct URIs with IDN domains not being resolved (#11520) 2019-08-07 21:14:08 +02:00
resolve_url_service.rb Fix URL search not returning private toots user has access to (#12742) 2020-01-03 05:01:45 +01:00
search_service.rb Fix error when using search API with no query (#12541) 2019-12-04 04:34:08 +01:00
suspend_account_service.rb Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +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 Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
unblock_domain_service.rb Add domain block notes (#11515) 2019-08-07 20:20:23 +02: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
update_account_service.rb Fix follow requests N+1 (#12004) 2019-09-30 17:02:03 +02: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