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

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/validators/unreserved_username_validator_spec.rb b/spec/validators/unreserved_username_validator_spec.rb
index cabd6d386..746b3866c 100644
--- a/spec/validators/unreserved_username_validator_spec.rb
+++ b/spec/validators/unreserved_username_validator_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe UnreservedUsernameValidator, type: :validator do
       context 'reserved_username?' do
         let(:reserved_username) { true }
 
-        it 'calls erros.add' do
+        it 'calls errors.add' do
           expect(errors).to have_received(:add).with(:username, :reserved)
         end
       end
@@ -35,7 +35,7 @@ RSpec.describe UnreservedUsernameValidator, type: :validator do
       context '!reserved_username?' do
         let(:reserved_username) { false }
 
-        it 'not calls erros.add' do
+        it 'not calls errors.add' do
           expect(errors).not_to have_received(:add).with(:username, any_args)
         end
       end