This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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		2019-07-19 18:26:49 +02:00
..
activitypub	Add support for Audio activities (#11189)	2019-06-26 19:32:36 +02:00
account_search_service_spec.rb	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
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)	2019-07-06 23:26:16 +02:00
batched_remove_status_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
block_domain_service_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
block_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
bootstrap_timeline_service_spec.rb	…
fan_out_on_write_service_spec.rb	…
favourite_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
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)	2019-07-19 01:44:42 +02:00
fetch_remote_status_service_spec.rb	…
fetch_resource_service_spec.rb	Add ActivityPub actor representing the entire server (#11321)	2019-07-19 01:44:42 +02:00
follow_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
hashtag_query_service_spec.rb	…
import_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
mute_service_spec.rb	…
notify_service_spec.rb	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	2019-06-03 14:54:30 +02:00
post_status_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
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)	2019-07-07 16:16:51 +02:00
reblog_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
reject_follow_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
remove_status_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
report_service_spec.rb	…
resolve_account_service_spec.rb	Refactor domain block checks (#11268)	2019-07-09 03:27:35 +02:00
resolve_url_service_spec.rb	Refactor fetching of remote resources (#11251)	2019-07-10 18:59:28 +02:00
search_service_spec.rb	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
suspend_account_service_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
unblock_domain_service_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
unblock_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
unfollow_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
unmute_service_spec.rb	…
verify_link_service_spec.rb	…