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

2022-03-04 01:07:49 +01:00
parent 3637a0101e 2ea754b861
commit d9c3109bb6
24 changed files with 66 additions and 57 deletions
--- a/spec/views/about/show.html.haml_spec.rb
+++ b/spec/views/about/show.html.haml_spec.rb
@@ -10,6 +10,7 @@ describe 'about/show.html.haml', without_verify_partial_doubles: true do
    allow(view).to receive(:site_title).and_return('example site')
    allow(view).to receive(:new_user).and_return(User.new)
    allow(view).to receive(:use_seamless_external_login?).and_return(false)
+    allow(view).to receive(:current_account).and_return(nil)
  end

  it 'has valid open graph tags' do