From 68ccaa3acbf80ad516600e4dcea387bb21595d04 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 4 May 2022 08:12:18 +0200 Subject: [PATCH] DEV: Fix typos and outdated comments (#16614) --- app/assets/javascripts/discourse/ember-cli-build.js | 2 +- .../javascripts/discourse/tests/helpers/qunit-helpers.js | 3 +-- config/dev_defaults.yml | 5 +++-- config/initializers/100-logster.rb | 2 +- lib/tasks/db.rake | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/discourse/ember-cli-build.js b/app/assets/javascripts/discourse/ember-cli-build.js index c7f9c2ff4e4..60f707624d4 100644 --- a/app/assets/javascripts/discourse/ember-cli-build.js +++ b/app/assets/javascripts/discourse/ember-cli-build.js @@ -22,7 +22,7 @@ module.exports = function (defaults) { insertContentForTestBody: false, }, sourcemaps: { - // There seems to be a bug with brocolli-concat when sourcemaps are disabled + // There seems to be a bug with broccoli-concat when sourcemaps are disabled // that causes the `app.import` statements below to fail in production mode. // This forces the use of `fast-sourcemap-concat` which works in production. enabled: true, diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js index 93c67017230..4261b2992d5 100644 --- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js +++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js @@ -241,7 +241,6 @@ export function discourseModule(name, options) { export function addPretenderCallback(name, fn) { if (name && fn) { if (_pretenderCallbacks[name]) { - // eslint-disable-next-line no-console throw `There is already a pretender callback with module name (${name}).`; } @@ -572,7 +571,7 @@ export async function paste(element, text, otherClipboardData = {}) { return e; } -// The order of attributes can vary in diffferent browsers. When comparing +// The order of attributes can vary in different browsers. When comparing // HTML strings from the DOM, this function helps to normalize them to make // comparison work cross-browser export function normalizeHtml(html) { diff --git a/config/dev_defaults.yml b/config/dev_defaults.yml index 978477e4860..dcdb65dfa09 100644 --- a/config/dev_defaults.yml +++ b/config/dev_defaults.yml @@ -26,6 +26,7 @@ topic: max: 12 overrides: # topic titles can be found in config/locales/faker.en.yml + # in the discourse_dev_assets gem - title: "Coolest thing you have seen today" count: 99 tags: @@ -36,5 +37,5 @@ user: count: 30 new_user: - username: new_user - email: new_user@example.com + username: new_user + email: new_user@example.com diff --git a/config/initializers/100-logster.rb b/config/initializers/100-logster.rb index 225e9728beb..5047a01a638 100644 --- a/config/initializers/100-logster.rb +++ b/config/initializers/100-logster.rb @@ -11,7 +11,7 @@ end if Rails.env.development? && RUBY_VERSION.match?(/^2\.5\.[23]/) STDERR.puts "WARNING: Discourse development environment runs slower on Ruby 2.5.3 or below" - STDERR.puts "We recommend you upgrade to Ruby 2.6.1 for the optimal development performance" + STDERR.puts "We recommend you upgrade to the latest Ruby 2.x for the optimal development performance" # we have to used to older and slower version of the logger cause the new one exposes a Ruby bug in # the Queue class which causes segmentation faults diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index 8d0c37013e8..1d5a0ed709a 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -129,7 +129,7 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do | SeedFu.quiet = true - def execute_concurently(concurrency, exceptions) + def execute_concurrently(concurrency, exceptions) queue = Queue.new RailsMultisite::ConnectionManagement.each_connection do |db| @@ -180,7 +180,7 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do | end end - execute_concurently(concurrency, exceptions) do |db| + execute_concurrently(concurrency, exceptions) do |db| puts "Migrating #{db}" ActiveRecord::Tasks::DatabaseTasks.migrate end @@ -189,7 +189,7 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do | SeedFu.seed(SeedHelper.paths, /001_refresh/) - execute_concurently(concurrency, exceptions) do |db| + execute_concurrently(concurrency, exceptions) do |db| puts "Seeding #{db}" SeedFu.seed(SeedHelper.paths, SeedHelper.filter)