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

diff --git a/lib/mastodon/search_cli.rb b/lib/mastodon/search_cli.rb
index b579ebc143477061794b93add25bdb76543855bc..b206854ab3274d8ac536928adf54ffea55cb2b43 100644 (file)
--- 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 d652468b37fb7318ee3c31ada99c79c5dea3c9ad..0ccfc9f29f2085c19f6731832e2d4832f6c1a917 100644 (file)
--- 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 2d300f18d6c71494d97fe6b42a9ca811e83ee055..5eccf32014335c0f7739791cd83eac11f9def1c6 100644 (file)
--- 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