Claire a482932649 Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change.		2024-02-27 19:20:57 +01:00
..
activitypub	…
admin	…
api	…
auth	Better tests for auth/registrations#update (#29303)	2024-02-26 16:09:56 +00:00
concerns	…
disputes	…
filters	…
oauth	…
settings	…
.rubocop.yml	…
about_controller_spec.rb	…
application_controller_spec.rb	…
authorize_interactions_controller_spec.rb	…
custom_css_controller_spec.rb	Use "cacheable response" shared example in more places (#29419)	2024-02-27 11:50:21 +00:00
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	Use "cacheable response" shared example in more places (#29419)	2024-02-27 11:50:21 +00:00
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	Use "cacheable response" shared example in more places (#29419)	2024-02-27 11:50:21 +00:00
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	Use "cacheable response" shared example in more places (#29419)	2024-02-27 11:50:21 +00:00