Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.

spec/helpers/application_helper_spec.rb

@@ -230,28 +230,6 @@ RSpec.describe ApplicationHelper do
     end
   end
 
-  describe 'visibility_icon' do
-    it 'returns a globe icon for a public visible status' do
-      result = helper.visibility_icon Status.new(visibility: 'public')
-      expect(result).to match(/globe/)
-    end
-
-    it 'returns an unlock icon for a unlisted visible status' do
-      result = helper.visibility_icon Status.new(visibility: 'unlisted')
-      expect(result).to match(/lock_open/)
-    end
-
-    it 'returns a lock icon for a private visible status' do
-      result = helper.visibility_icon Status.new(visibility: 'private')
-      expect(result).to match(/lock/)
-    end
-
-    it 'returns an at icon for a direct visible status' do
-      result = helper.visibility_icon Status.new(visibility: 'direct')
-      expect(result).to match(/alternate_email/)
-    end
-  end
-
   describe 'title' do
     it 'returns site title on production environment' do
       Setting.site_title = 'site title'