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	…
admin	Fix: Ensure "With Media" is highlighted from Admin Accounts page (#30812)	2024-06-25 07:46:53 +00:00
api	Add `Api::ErrorHandling` concern for api/base controller (#29574)	2024-03-14 09:09:47 +00:00
auth	…
concerns	Rename `cache_*` methods to `preload_*` in controller concern (#30209)	2024-05-16 08:03:46 +00:00
disputes	…
filters	…
oauth	Merge pull request from GHSA-vp5r-5pgw-jwqx	2024-07-04 16:11:28 +02:00
settings	Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream	2024-07-04 17:12:14 +02:00
.rubocop.yml	…
about_controller_spec.rb	…
application_controller_spec.rb	Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream	2024-05-01 18:42:26 +02:00
authorize_interactions_controller_spec.rb	…
custom_css_controller_spec.rb	…
emojis_controller_spec.rb	…
filters_controller_spec.rb	…
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
health_controller_spec.rb	…
home_controller_spec.rb	…
instance_actors_controller_spec.rb	…
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	…
media_proxy_controller_spec.rb	…
privacy_controller_spec.rb	…
relationships_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_cleanup_controller_spec.rb	…
statuses_controller_spec.rb	…
tags_controller_spec.rb	…