Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.		2023-05-08 15:28:36 +02:00
..
activitypub	Autofix Rubocop RSpec/MatchArray (#24050)	2023-04-26 20:21:54 +02:00
admin	Autofix Rubocop RSpec/MatchArray (#24050)	2023-04-26 20:21:54 +02:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
auth	Fix Rails/I18nLocaleAssignment cop (#24693)	2023-04-30 14:07:03 +02:00
concerns	…
disputes	…
filters	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
oauth	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
well_known	…
about_controller_spec.rb	…
accounts_controller_spec.rb	Fix caching logic with regards to Accept-Language, Cookie, and Signature (#24604)	2023-04-23 22:27:24 +02:00
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
authorize_interactions_controller_spec.rb	…
custom_css_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
emojis_controller_spec.rb	…
filters_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
follower_accounts_controller_spec.rb	Autofix Rubocop Rails/ResponseParsedBody (#24051)	2023-04-26 17:25:07 +02:00
following_accounts_controller_spec.rb	Autofix Rubocop Rails/ResponseParsedBody (#24051)	2023-04-26 17:25:07 +02:00
health_controller_spec.rb	…
home_controller_spec.rb	…
instance_actors_controller_spec.rb	…
intents_controller_spec.rb	…
invites_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
manifests_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
media_controller_spec.rb	…
media_proxy_controller_spec.rb	…
privacy_controller_spec.rb	…
relationships_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
shares_controller_spec.rb	Remove instance variables from helper usage (#24203)	2023-04-23 22:35:54 +02:00
statuses_cleanup_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
statuses_controller_spec.rb	Fix caching logic with regards to Accept-Language, Cookie, and Signature (#24604)	2023-04-23 22:27:24 +02:00
tags_controller_spec.rb	Fix caching logic with regards to Accept-Language, Cookie, and Signature (#24604)	2023-04-23 22:27:24 +02:00