Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream added new validations close to lines on which glitch-soc had modified validations to handle custom limits set through environment variables. Ported upstream changes. - `config/initializers/content_security_policy.rb`: Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is completely different. Added `AZURE_ALIAS_HOST` to our version of the file.		2023-07-30 13:15:01 +02:00
..
accounts
admin
announcements
apps
crypto
emails
featured_tags
instances
lists
polls
push
statuses	Wrong count in response when removing favourite/reblog (#24365)	2023-07-19 09:02:30 +02:00
timelines	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream	2023-07-13 13:35:15 +02:00
trends
accounts_controller.rb
announcements_controller.rb
apps_controller.rb
blocks_controller.rb
bookmarks_controller.rb	Fix Naming/MemoizedInstanceVariableName cop (#25928)	2023-07-12 10:08:51 +02:00
conversations_controller.rb
custom_emojis_controller.rb
directories_controller.rb
domain_blocks_controller.rb
endorsements_controller.rb
favourites_controller.rb	Fix Naming/MemoizedInstanceVariableName cop (#25928)	2023-07-12 10:08:51 +02:00
featured_tags_controller.rb
filters_controller.rb
follow_requests_controller.rb
followed_tags_controller.rb
instances_controller.rb
lists_controller.rb
markers_controller.rb	Change markers API to use a replica (#25851)	2023-07-12 18:57:40 +02:00
media_controller.rb
mutes_controller.rb
notifications_controller.rb	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream	2023-07-13 13:35:15 +02:00
polls_controller.rb
preferences_controller.rb
reports_controller.rb	Add forward_to_domains parameter to POST /api/v1/reports (#25866)	2023-07-10 18:26:56 +02:00
scheduled_statuses_controller.rb
statuses_controller.rb
streaming_controller.rb
suggestions_controller.rb
tags_controller.rb	Remove unfollowed hashtag posts from home feed (#26028)	2023-07-17 13:56:28 +02:00