Claire 5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream ... Conflicts: - `spec/lib/sanitize/config_spec.rb`: Upstream rewrote top-level `describe` calls to `RSpec.describe`, and glitch-soc had differences in the first few tests because of the wider subset of HTML it accepts. Changed `describe` to `RSpec.describe` as upstream did, keeping glitch-soc's tests.		2024-09-04 19:38:52 +02:00
..
activitypub	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
admin	Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream	2024-07-29 19:16:58 +02:00
api	Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream	2024-09-04 19:38:52 +02:00
auth	Fix log out from user menu not working on Safari (#31402)	2024-08-13 17:49:23 +00:00
concerns	Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream	2024-08-02 18:09:48 +02:00
disputes	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
filters	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
oauth	Merge pull request from GHSA-vp5r-5pgw-jwqx	2024-07-04 16:11:28 +02:00
redirect	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
settings	Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
well_known	Implement RFC 8414 for OAuth 2.0 server metadata (#29191)	2024-05-06 13:17:56 +00:00
about_controller.rb	Simplify instance presenter view access (#26046)	2023-09-28 16:52:37 +02:00
accounts_controller.rb	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
application_controller.rb	Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream	2024-07-25 17:47:02 +02:00
authorize_interactions_controller.rb	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00
backups_controller.rb	Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439)	2023-10-23 15:46:21 +00:00
custom_css_controller.rb	Add scope providing_styles to UserRole (#29286)	2024-02-20 09:18:05 +00:00
emojis_controller.rb	Refactor Cache-Control and Vary definitions (#24347)	2023-04-19 16:07:29 +02:00
filters_controller.rb	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
follower_accounts_controller.rb	Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream	2023-10-08 17:26:43 +02:00
following_accounts_controller.rb	Fix Vary headers not being set on some redirects (#27272)	2023-10-05 09:50:08 +02:00
health_controller.rb	Disable Rails/ApplicationController for HealthController (#28705)	2024-01-12 09:08:17 +00:00
home_controller.rb	Simplify instance presenter view access (#26046)	2023-09-28 16:52:37 +02:00
instance_actors_controller.rb	Move common module inclusion in sub classes to ActivityPub::BaseController (#29560)	2024-03-15 10:40:21 +00:00
intents_controller.rb	Remove redundant return in IntentsController (#29099)	2024-02-06 12:56:22 +00:00
invites_controller.rb	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
mail_subscriptions_controller.rb	Fix contrast between background and form elements on some pages (#31266)	2024-08-02 13:55:31 +00:00
manifests_controller.rb	Fix some user-independent endpoints potentially reading session cookies (#24650)	2023-04-25 22:14:44 +02:00
media_controller.rb	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
media_proxy_controller.rb	Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)	2023-08-02 19:32:48 +02:00
privacy_controller.rb	Simplify instance presenter view access (#26046)	2023-09-28 16:52:37 +02:00
relationships_controller.rb	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
remote_interaction_helper_controller.rb	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00
severed_relationships_controller.rb	Use existing SeveredRelationship.about_local_account scope in more places (#29673)	2024-03-21 08:36:49 +00:00
shares_controller.rb	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
statuses_cleanup_controller.rb	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
statuses_controller.rb	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
tags_controller.rb	Rename cache_* methods to preload_* in controller concern (#30209)	2024-05-16 08:03:46 +00:00