Claire e61a7794f8 Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Conflict because glitch-soc has a different list of allowed tags. Added upstream's new allowed tags while keeping ours. - `spec/requests/api/v1/timelines/public_spec.rb`: Conflict because of glitch-soc's default settings. Updated accordingly.		2024-07-04 17:12:14 +02:00
..
activitypub	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
admin	Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream	2024-06-11 19:46:11 +02:00
api	Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream	2024-07-04 17:12:14 +02:00
auth	Remove exclusion for `Rails/LexicallyScopedActionFilter` cop (#30697)	2024-06-21 15:34:13 +00:00
concerns	Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +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	…
accounts_controller.rb	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
application_controller.rb	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
authorize_interactions_controller.rb	…
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	…
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	…
health_controller.rb	Disable `Rails/ApplicationController` for `HealthController` (#28705)	2024-01-12 09:08:17 +00:00
home_controller.rb	…
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	…
manifests_controller.rb	…
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	…
privacy_controller.rb	…
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	…
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