You cannot 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		6 years ago
..
activitypub	Fix caching headers in ActivityPub endpoints (#11331)	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
auth	…
concerns	Add ActivityPub secure mode (#11269)	6 years ago
oauth	…
settings	Add option to disable real-time updates in web UI (#9984)	6 years ago
well_known	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
authorize_interactions_controller.rb	…
custom_css_controller.rb	Fix custom CSS controller (#11336)	6 years ago
directories_controller.rb	…
emojis_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	6 years ago
filters_controller.rb	…
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
instance_actors_controller.rb	Add ActivityPub actor representing the entire server (#11321)	6 years ago
intents_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	6 years ago
invites_controller.rb	…
manifests_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	6 years ago
media_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	6 years ago
media_proxy_controller.rb	Change domain blocks to automatically support subdomains (#11138)	6 years ago
public_timelines_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
relationships_controller.rb	…
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_interaction_controller.rb	…
shares_controller.rb	…
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago