queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/services
History
Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict due to glitch-soc having to take care of local-only
  pinned toots in that controller.
  Took upstream's changes and restored the local-only special
  handling.
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflicts due to the theming system, applied upstream
  changes, adapted the following two files for glitch-soc's
  theming system:
  - `app/controllers/concerns/sign_in_token_authentication_concern.rb`
  - `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
  Minor conflict due to glitch-soc having to handle local-only
  toots specially. Applied upstream changes and restored
  the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
  Minor conflict due to the theming system.
- `package.json`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
- `yarn.lock`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
2020-06-09 10:39:20 +02:00
..
activitypub Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
concerns Fix activity not being signed (#13948) 2020-06-03 08:33:30 +02:00
keys Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
account_search_service.rb Fix error when searching for URLs that contain the mention syntax (#13151) 2020-03-08 15:42:20 +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-06-09 10:39:20 +02:00
base_service.rb
batched_remove_status_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +02:00
block_domain_service.rb Make domain block/silence/reject-media code more robust (#13424) 2020-06-09 10:32:00 +02: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
clear_domain_media_service.rb Make domain block/silence/reject-media code more robust (#13424) 2020-06-09 10:32:00 +02: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 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +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 Fix not being able to resolve public resources in development environment (#13505) 2020-04-25 22:01:08 +02:00
follow_service.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01: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 Fix performance of follow import (#13836) 2020-06-09 10:26:58 +02: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 conversations API (#8832) 2018-10-07 23:44:58 +02:00
notify_service.rb Add follow_request notification type (#12198) 2019-12-01 17:25:29 +01:00
post_status_service.rb Fix crash when posting with a CW but no text nor media 2020-03-27 22:28:39 +01: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-06-09 10:39:20 +02:00
reblog_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +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 2020-05-13 22:11:49 +02:00
report_service.rb Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966) 2019-06-04 23:11:18 +02:00
resolve_account_service.rb Fix performance of follow import (#13836) 2020-06-09 10:26:58 +02:00
resolve_url_service.rb Fix some timeouts when searching URLs by limiting some database queries (#13253) 2020-03-12 23:06:43 +01:00
search_service.rb Fix hashtag search performing account search as well (#13758) 2020-05-14 23:37:37 +02: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 Rescue SSL error in verify link service (#9914) 2019-01-24 15:38:18 +01:00
vote_service.rb Fix invalid votes from the API being accepted (#12601) 2020-01-12 14:17:03 +01:00