Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire committed 2022-10-28 19:23:58 +02:00
commit cb19be67d1
567 files changed
+14361 -20828

No files matched your search

@@ -99,13 +99,6 @@ describe InstancePresenter do
end
end
describe '#hero' do
it 'returns SiteUpload' do
hero = Fabricate(:site_upload, var: 'hero')
expect(instance_presenter.hero).to eq(hero)
end
end
describe '#mascot' do
it 'returns SiteUpload' do
mascot = Fabricate(:site_upload, var: 'mascot')