Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.		2020-09-28 14:13:30 +02:00
..
activitypub
account_search_service_spec.rb
after_block_domain_from_account_service_spec.rb
after_block_service_spec.rb
app_sign_up_service_spec.rb
authorize_follow_service_spec.rb
batched_remove_status_service_spec.rb
block_domain_service_spec.rb
block_service_spec.rb
bootstrap_timeline_service_spec.rb
clear_domain_media_service_spec.rb
delete_account_service_spec.rb	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
fan_out_on_write_service_spec.rb	Refactor how public and tag timelines are queried (#14728)	2020-09-07 11:02:04 +02:00
favourite_service_spec.rb
fetch_link_card_service_spec.rb
fetch_oembed_service_spec.rb
fetch_remote_status_service_spec.rb
fetch_resource_service_spec.rb
follow_service_spec.rb
import_service_spec.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
mute_service_spec.rb
notify_service_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
post_status_service_spec.rb
precompute_feed_service_spec.rb	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
process_mentions_service_spec.rb
reblog_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
reject_follow_service_spec.rb
remove_status_service_spec.rb
report_service_spec.rb
resolve_account_service_spec.rb
resolve_url_service_spec.rb
search_service_spec.rb
unallow_domain_service_spec.rb	Fix various warnings in rspec (#14729)	2020-09-04 20:22:26 +02:00
unblock_domain_service_spec.rb
unblock_service_spec.rb
unfollow_service_spec.rb
unmute_service_spec.rb
update_account_service_spec.rb
verify_link_service_spec.rb