mirror
/
glitch-soc
mirror of https://github.com/glitch-soc/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
glitch-soc/spec/views/statuses
History
Claire 5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests.
 		2024-09-04 19:38:52 +02:00
..
show.html.haml_spec.rb Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream 2024-09-04 19:38:52 +02:00