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

Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml

Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.

Conflicts in `pl.json` resolved by taking upstream's changes.

Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.

1 files changed, 0 insertions, 35 deletions

diff --git a/spec/views/about/_contact.html.haml_spec.rb b/spec/views/about/_contact.html.haml_spec.rb
deleted file mode 100644
index 25ba15794..000000000
--- a/spec/views/about/_contact.html.haml_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe 'about/_contact.html.haml' do
-  describe 'the contact account', without_verify_partial_doubles: true do
-    before do
-      allow(view).to receive(:display_name).and_return('Display Name!')
-    end
-
-    it 'shows info when account is present' do
-      account = Account.new(username: 'admin')
-      contact = double(contact_account: account, site_contact_email: '')
-      render 'about/contact', contact: contact
-
-      expect(rendered).to have_content('@admin')
-    end
-
-    it 'does not show info when account is missing' do
-      contact = double(contact_account: nil, site_contact_email: '')
-      render 'about/contact', contact: contact
-
-      expect(rendered).not_to have_content('@')
-    end
-  end
-
-  describe 'the contact email' do
-    it 'show info when email is present' do
-      contact = double(site_contact_email: 'admin@example.com', contact_account: nil)
-      render 'about/contact', contact: contact
-
-      expect(rendered).to have_content('admin@example.com')
-    end
-  end
-end