You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		5 years ago
..
activitypub	Add support for Audio activities (#11189)	5 years ago
account_search_service_spec.rb	Improve blocked view of profiles (#10491)	6 years ago
after_block_domain_from_account_service_spec.rb	…
after_block_service_spec.rb	…
app_sign_up_service_spec.rb	…
authorize_follow_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
batched_remove_status_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
block_domain_service_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	6 years ago
block_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
bootstrap_timeline_service_spec.rb	…
fan_out_on_write_service_spec.rb	…
favourite_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
fetch_link_card_service_spec.rb	…
fetch_oembed_service_spec.rb	…
fetch_remote_account_service_spec.rb	Add ActivityPub actor representing the entire server (#11321)	5 years ago
fetch_remote_status_service_spec.rb	…
fetch_resource_service_spec.rb	Add ActivityPub actor representing the entire server (#11321)	5 years ago
follow_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
hashtag_query_service_spec.rb	…
import_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
mute_service_spec.rb	…
notify_service_spec.rb	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	6 years ago
post_status_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
precompute_feed_service_spec.rb	…
process_mentions_service_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
reblog_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
reject_follow_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
remove_status_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
report_service_spec.rb	…
resolve_account_service_spec.rb	Refactor domain block checks (#11268)	5 years ago
resolve_url_service_spec.rb	Refactor fetching of remote resources (#11251)	5 years ago
search_service_spec.rb	Improve blocked view of profiles (#10491)	6 years ago
suspend_account_service_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
unblock_domain_service_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	6 years ago
unblock_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
unfollow_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
unmute_service_spec.rb	…
verify_link_service_spec.rb	…