* 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
th-downstream
luzpaz 2 years ago committed by GitHub
parent ecddc06474
commit 45ddea2f0c

@ -55,7 +55,7 @@ jobs:
with: with:
node-version: 16.x node-version: 16.x
cache: yarn cache: yarn
- name: Intall dependencies - name: Install dependencies
run: yarn install --frozen-lockfile run: yarn install --frozen-lockfile
- name: Set-up RuboCop Problem Mathcher - name: Set-up RuboCop Problem Mathcher
uses: r7kamura/rubocop-problem-matchers-action@v1 uses: r7kamura/rubocop-problem-matchers-action@v1

@ -30,7 +30,7 @@ module Mastodon
changed since the last run. Index upgrades erase index data. changed since the last run. Index upgrades erase index data.
Even if creating or upgrading indices is not necessary, data from the 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 LONG_DESC
def deploy def deploy
if options[:concurrency] < 1 if options[:concurrency] < 1

@ -11,7 +11,7 @@ namespace :mastodon do
# When the application code gets loaded, it runs `lib/mastodon/redis_configuration.rb`. # When the application code gets loaded, it runs `lib/mastodon/redis_configuration.rb`.
# This happens before application environment configuration and sets REDIS_URL etc. # 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 # 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('REDIS_URL')
ENV.delete('CACHE_REDIS_URL') ENV.delete('CACHE_REDIS_URL')
ENV.delete('SIDEKIQ_REDIS_URL') ENV.delete('SIDEKIQ_REDIS_URL')

@ -63,7 +63,7 @@ describe Request do
expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made
end end
it 'closes underlaying connection' do it 'closes underlying connection' do
expect_any_instance_of(HTTP::Client).to receive(:close) expect_any_instance_of(HTTP::Client).to receive(:close)
expect { |block| subject.perform &block }.to yield_control expect { |block| subject.perform &block }.to yield_control
end end

Loading…
Cancel
Save