Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code.
page_json
DomainHelpers
have_http_link_header
spec/controllers/oauth/*
body_as_json
response.parsed_body
RSpec/InstanceVariable