Claire 2d4b4b0b45 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream introduced support for private pinned toots, but glitch-soc's query was a bit different as it filtered out local-only toots. Used upstream's query, while adding local-only filtering back. - `app/controllers/activitypub/collections_controller.rb`: Same thing with regards to local-only posts. - `app/validators/status_pin_validator.rb`: Not a real conflict, but the line below was different in glitch-soc due to the configurable pinned toots limit.		2022-01-17 08:28:52 +01:00
..
activitypub	Add support for private pinned posts (#16954)	2022-01-17 00:49:55 +01:00
admin	Add ability for admins to delete canonical email blocks (#16644)	2021-12-17 23:02:14 +01:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 08:28:52 +01:00
auth	Remove IP tracking columns from users table (#16409)	2022-01-16 13:23:50 +01:00
concerns	Fix cache_collection crashing when given an empty collection (#15921)	2021-03-18 00:41:32 +01:00
oauth	…
settings	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
well_known	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Add support for private pinned posts (#16954)	2022-01-17 00:49:55 +01:00
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-24 10:53:50 +01:00
authorize_interactions_controller_spec.rb	Change ResolveAccountService's handling of skip_webfinger (#15750)	2021-02-24 06:32:13 +01:00
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	Fix serialization of followers/following counts when user hides their network (#16418)	2021-06-21 20:14:47 +02:00
following_accounts_controller_spec.rb	Fix serialization of followers/following counts when user hides their network (#16418)	2021-06-21 20:14:47 +02:00
health_controller_spec.rb	Fix glitch-soc-specific health check spec	2021-04-05 15:21:38 +02:00
home_controller_spec.rb	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	Fix error when rendering public pages with media attachments (#16763)	2021-10-13 15:27:19 +02:00
media_proxy_controller_spec.rb	…
relationships_controller_spec.rb	Remove PubSubHubbub-related columns from accounts table (#16170)	2021-05-07 19:32:58 +02:00
remote_follow_controller_spec.rb	…
remote_interaction_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_cleanup_controller_spec.rb	Add feature to automatically delete old toots (#16529)	2021-08-09 23:11:50 +02:00
statuses_controller_spec.rb	…
tags_controller_spec.rb	…