From 01937b2de2bb99689fadb5cfcf7c21144253b4cd Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 26 Jun 2020 11:03:47 +0800 Subject: [PATCH] Revert "FIX: Seed needs to run before optimizing site icons." This reverts commit 715ddf38618555c7ba798f8526f85f79a7a5d365. --- lib/tasks/db.rake | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index e8d3c42e7d..e6096e8f67 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -158,15 +158,12 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do | execute_concurently(concurrency, exceptions) do |db| - if !Discourse.skip_post_deployment_migrations? + if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1' + SiteIconManager.ensure_optimized! if ENV['SKIP_SEED'] != '1' puts "Seeding #{db}" SeedFu.seed(seed_paths) end - - if ENV['SKIP_OPTIMIZE_ICONS'] != '1' - SiteIconManager.ensure_optimized! - end end end