Claire b735954971 Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc.		2023-05-25 20:43:25 +02:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
admin	Fix uncaught NoMethodError error in /api/v1/admin/canonical_email_blocks/test (#24947)	2023-05-12 13:46:16 +02:00
announcements
apps
crypto
emails	Enable Rubocop HTTP status rules (#23717)	2023-02-20 11:16:40 +09:00
featured_tags
instances	Fix /api/v1/instance/domain_blocks being unconditionally cached (#24662)	2023-04-26 11:42:47 +02:00
lists	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
polls
push	Fix Rails/ActionOrder cop (#24692)	2023-04-30 06:46:39 +02:00
statuses	Change unauthenticated responses to be cached in REST API (#24348)	2023-04-25 15:41:34 +02:00
timelines	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
trends	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
accounts_controller.rb	Change unauthenticated responses to be cached in REST API (#24348)	2023-04-25 15:41:34 +02:00
announcements_controller.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
apps_controller.rb
blocks_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
bookmarks_controller.rb
conversations_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
custom_emojis_controller.rb	Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed (#24665)	2023-04-28 10:01:38 +02:00
directories_controller.rb	Change unauthenticated responses to be cached in REST API (#24348)	2023-04-25 15:41:34 +02:00
domain_blocks_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
endorsements_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
favourites_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
featured_tags_controller.rb
filters_controller.rb	Fix Rails/ActionOrder cop (#24692)	2023-04-30 06:46:39 +02:00
follow_requests_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
followed_tags_controller.rb
instances_controller.rb	Fix some user-independent endpoints potentially reading session cookies (#24650)	2023-04-25 22:14:44 +02:00
lists_controller.rb
markers_controller.rb
media_controller.rb	Make it possible to upload audio and video to Heroku app (#24866)	2023-05-05 14:41:07 +02:00
mutes_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
notifications_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
polls_controller.rb	Change unauthenticated responses to be cached in REST API (#24348)	2023-04-25 15:41:34 +02:00
preferences_controller.rb
reports_controller.rb
scheduled_statuses_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
streaming_controller.rb	Add allow_other_host in redirects which may go outside app (#24252)	2023-03-26 00:38:32 +01:00
suggestions_controller.rb
tags_controller.rb	Change unauthenticated responses to be cached in REST API (#24348)	2023-04-25 15:41:34 +02:00