luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-02-01 01:18:17 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/services
History
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock

A lot of the conflicts come from updating webpack.

Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.

Ported glitch changes to webpack 4.x
2018-07-16 14:50:42 +02:00
..
activitypub Raise Mastodon::RaceConditionError if Redis lock failed (#7511) 2018-05-16 12:29:45 +02:00
concerns
pubsubhubbub
account_search_service.rb Prevent suspended accounts from appearing in AccountSearchService (#7246) 2018-04-23 21:27:18 +02:00
after_block_domain_from_account_service.rb Fix domain hiding logic (#7765) 2018-06-09 22:46:54 +02:00
after_block_service.rb
authorize_follow_service.rb
backup_service.rb Add entropy to download filenames (#6811) 2018-03-17 17:39:28 +01:00
base_service.rb
batched_remove_status_service.rb Improve counter caches on Status and Account (#7644) 2018-05-30 02:50:23 +02:00
block_domain_service.rb After blocking domain with reject_media, invalidate cache (#6679) 2018-03-08 06:59:42 +01:00
block_service.rb
bootstrap_timeline_service.rb Add autofollow option to invites (#7805) 2018-06-15 18:00:23 +02:00
fan_out_on_write_service.rb Reduce wasted work in RemoveStatusService due to inactive followers (#7672) 2018-05-29 22:55:33 +02:00
favourite_service.rb Re-add follow recommendations API (#7918) 2018-07-03 01:47:56 +02:00
fetch_atom_service.rb Support Actors/Statuses with multiple types (#7305) 2018-05-02 12:40:24 +02:00
fetch_link_card_service.rb Skip processing when HEAD method returns 501 (#7730) 2018-06-04 13:42:53 +02:00
fetch_oembed_service.rb Slightly reduce RAM usage (#7301) 2018-05-02 18:58:48 +02:00
fetch_remote_account_service.rb
fetch_remote_status_service.rb
follow_service.rb
mute_service.rb Keep notification when muting_notifications is true (#7311) 2018-05-02 16:14:51 +02:00
notify_service.rb Add REST API for Web Push Notifications subscriptions (#7445) 2018-05-11 11:49:12 +02:00
post_status_service.rb Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
precompute_feed_service.rb
process_feed_service.rb
process_hashtags_service.rb Exclude unlisted, private and direct toots from affecting trends (#7686) 2018-05-31 16:47:28 +02:00
process_interaction_service.rb
process_mentions_service.rb Improve PostStatusService performance (#7317) 2018-05-02 22:10:57 +02:00
reblog_service.rb Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
reject_follow_service.rb
remove_status_service.rb Add federation relay support (#7998) 2018-07-13 02:16:06 +02:00
report_service.rb
resolve_account_service.rb Raise Mastodon::RaceConditionError if Redis lock failed (#7511) 2018-05-16 12:29:45 +02:00
resolve_url_service.rb Support Actors/Statuses with multiple types (#7305) 2018-05-02 12:40:24 +02:00
search_service.rb Remove extra spaces from search API queries and public account headers (fixes #7129) (#7152) 2018-04-16 17:19:04 +02:00
send_interaction_service.rb Close http connection in perform method of Request class (#6889) 2018-03-24 12:49:54 +01:00
subscribe_service.rb Close http connection in perform method of Request class (#6889) 2018-03-24 12:49:54 +01:00
suspend_account_service.rb Add federation relay support (#7998) 2018-07-13 02:16:06 +02:00
unblock_domain_service.rb
unblock_service.rb
unfavourite_service.rb
unfollow_service.rb
unmute_service.rb
unsubscribe_service.rb Close http connection in perform method of Request class (#6889) 2018-03-24 12:49:54 +01:00
update_account_service.rb
update_remote_profile_service.rb Fix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501) 2018-05-15 16:03:34 +02:00
verify_salmon_service.rb