mastodon/app/services
Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict due to upstream adding a new parameter (with_rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/services/post_status_service.rb`:
  Conflict due to upstream adding a new parameter (rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to us not exposing theme settings here (as we have
  a different flavour/skin menu).
  Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
  Coding style fixes for a part we have rewritten.
  Discarded upstream changes.
2020-03-08 19:38:53 +01:00
..
activitypub Fix duplicate accounts being created when fetching an account for its key only (#13147) 2020-02-24 21:15:53 +01:00
concerns
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
after_block_service.rb
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
backup_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-02-25 14:28:13 +01:00
base_service.rb
batched_remove_status_service.rb
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
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
favourite_service.rb
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 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
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 2020-03-08 19:38:53 +01:00
precompute_feed_service.rb
process_hashtags_service.rb
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 2020-03-08 19:38:53 +01:00
reject_follow_service.rb
remove_status_service.rb
report_service.rb
resolve_account_service.rb Fix previously OStatus-based accounts not being detected as ActivityPub (#13129) 2020-02-22 01:26:41 +01: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
tag_search_service.rb
unallow_domain_service.rb
unblock_domain_service.rb
unblock_service.rb
unfavourite_service.rb
unfollow_service.rb
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