Commit Graph

4 Commits

Author SHA1 Message Date
Claire fef055db96 Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
  Upstream refactored this file, while we had a change to switch a default setting.
  Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
  Upstream refactored this file, while we stubbed different methods.
  Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
Matt Jankowski e1fa456c7c
Add `have_cacheable_headers` matcher for responses (#31727) 2024-09-03 15:35:19 +00:00
Claire 8f678a3cf4 Fix tests for glitch-soc 2024-08-26 19:08:42 +02:00
Matt Jankowski 5172d84946
Convert `manifest` controller spec to request spec (#31596) 2024-08-26 14:37:23 +00:00