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
admin	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
concerns
import
scheduler
web
account_deletion_worker.rb
after_account_domain_block_worker.rb
after_unallow_domain_worker.rb
authorize_follow_worker.rb
backup_worker.rb
block_worker.rb
bootstrap_timeline_worker.rb
delete_mute_worker.rb
digest_mailer_worker.rb
distribution_worker.rb
domain_block_worker.rb
domain_clear_media_worker.rb
feed_insert_worker.rb
fetch_reply_worker.rb
import_worker.rb
link_crawl_worker.rb
local_notification_worker.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
merge_worker.rb
move_worker.rb
mute_worker.rb
poll_expiration_notify_worker.rb
post_process_media_worker.rb
publish_announcement_reaction_worker.rb
publish_scheduled_announcement_worker.rb
publish_scheduled_status_worker.rb
push_conversation_worker.rb
push_encrypted_message_worker.rb
push_update_worker.rb
redownload_media_worker.rb
refollow_worker.rb
regeneration_worker.rb
removal_worker.rb
resolve_account_worker.rb
thread_resolve_worker.rb
unfavourite_worker.rb
unfollow_follow_worker.rb
unmerge_worker.rb
unpublish_announcement_worker.rb
verify_account_links_worker.rb