Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		2020-10-21 19:10:50 +02:00
..
activitypub	Add follower synchronization mechanism (#14510)	2020-10-21 18:04:09 +02:00
account_search_service_spec.rb
after_block_domain_from_account_service_spec.rb
after_block_service_spec.rb
app_sign_up_service_spec.rb	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
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	Make domain block/silence/reject-media code more robust (#13424)	2020-06-09 10:32:00 +02:00
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
process_mentions_service_spec.rb
reblog_service_spec.rb
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	Fix hashtag search performing account search as well (#13758)	2020-05-14 23:37:37 +02:00
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