Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes.		2022-11-10 09:36:47 +01:00
..
credentials_controller.rb
familiar_followers_controller.rb	Add /api/v1/accounts/familiar_followers to REST API (#17700)	2022-03-07 09:36:47 +01:00
featured_tags_controller.rb	Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer (#15415)	2020-12-23 16:43:38 +01:00
follower_accounts_controller.rb	Change following and followers API to be accessible without being logged in (#18964)	2022-08-28 03:45:07 +02:00
following_accounts_controller.rb	Change following and followers API to be accessible without being logged in (#18964)	2022-08-28 03:45:07 +02:00
identity_proofs_controller.rb	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
lists_controller.rb
lookup_controller.rb	Fix error when looking handle with surrounding spaces (#18225)	2022-05-02 01:00:08 +02:00
notes_controller.rb
pins_controller.rb	Make account endorsements idempotent (fix #19045) (#20118)	2022-11-08 16:39:15 +01:00
relationships_controller.rb
search_controller.rb
statuses_controller.rb	Fix performance of account timelines (#17709)	2022-03-08 09:14:39 +01:00