From 4aa3b9bd016ef5d9ce9bb63f260b7f6e35b649ff Mon Sep 17 00:00:00 2001
From: luzpaz <luzpaz@users.noreply.github.com>
Date: Sun, 28 Aug 2022 11:44:34 -0400
Subject: [PATCH] Fix typos (#18604)

* Fix typos

Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,pixelx,ro`

* Follow-up typo fix
---
 .github/workflows/linter.yml | 2 +-
 lib/mastodon/search_cli.rb   | 2 +-
 lib/tasks/mastodon.rake      | 2 +-
 spec/lib/request_spec.rb     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index f77a9720e0..cd8cb12c45 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -55,7 +55,7 @@ jobs:
         with:
           node-version: 16.x
           cache: yarn
-      - name: Intall dependencies
+      - name: Install dependencies
         run: yarn install --frozen-lockfile
       - name: Set-up RuboCop Problem Mathcher
         uses: r7kamura/rubocop-problem-matchers-action@v1
diff --git a/lib/mastodon/search_cli.rb b/lib/mastodon/search_cli.rb
index b579ebc143..b206854ab3 100644
--- a/lib/mastodon/search_cli.rb
+++ b/lib/mastodon/search_cli.rb
@@ -30,7 +30,7 @@ module Mastodon
       changed since the last run. Index upgrades erase index data.
 
       Even if creating or upgrading indices is not necessary, data from the
-      database will be imported into the indices, unless overriden with --no-import.
+      database will be imported into the indices, unless overridden with --no-import.
     LONG_DESC
     def deploy
       if options[:concurrency] < 1
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index d652468b37..0ccfc9f29f 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -11,7 +11,7 @@ namespace :mastodon do
     # When the application code gets loaded, it runs `lib/mastodon/redis_configuration.rb`.
     # This happens before application environment configuration and sets REDIS_URL etc.
     # These variables are then used even when REDIS_HOST etc. are changed, so clear them
-    # out so they don't interfer with our new configuration.
+    # out so they don't interfere with our new configuration.
     ENV.delete('REDIS_URL')
     ENV.delete('CACHE_REDIS_URL')
     ENV.delete('SIDEKIQ_REDIS_URL')
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb
index 2d300f18d6..5eccf32014 100644
--- a/spec/lib/request_spec.rb
+++ b/spec/lib/request_spec.rb
@@ -63,7 +63,7 @@ describe Request do
         expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made
       end
 
-      it 'closes underlaying connection' do
+      it 'closes underlying connection' do
         expect_any_instance_of(HTTP::Client).to receive(:close)
         expect { |block| subject.perform &block }.to yield_control
       end
-- 
GitLab