From 4e89d3f7788ab8edf877bb06dcef0bc199f34ee7 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 12 Oct 2017 14:12:18 +0800 Subject: [PATCH] Only refresh site settings once on initialization. --- app/models/site_setting.rb | 5 ----- config/environments/development.rb | 3 --- .../{005-site_settings.rb => 004-site_settings.rb} | 0 .../initializers/{004-message_bus.rb => 005-message_bus.rb} | 0 4 files changed, 8 deletions(-) rename config/initializers/{005-site_settings.rb => 004-site_settings.rb} (100%) rename config/initializers/{004-message_bus.rb => 005-message_bus.rb} (100%) diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index 3bd1b28d0e2..c023e339dd4 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -27,11 +27,6 @@ class SiteSetting < ActiveRecord::Base end end - # `current` hash is not populated everytime when load a site setting - # in order to support locale default. Instead, we simply `refresh!` once. - # This should only affects the spec in which you should populate `current` - refresh! - client_settings << :available_locales def self.available_locales diff --git a/config/environments/development.rb b/config/environments/development.rb index dc0a0cda2e7..d9c10db2e8a 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -59,9 +59,6 @@ Discourse::Application.configure do end config.after_initialize do - SiteSetting.defaults.set_regardless_of_locale(:port, 3000) - SiteSetting.refresh! - if ENV['BULLET'] Bullet.enable = true Bullet.rails_logger = true diff --git a/config/initializers/005-site_settings.rb b/config/initializers/004-site_settings.rb similarity index 100% rename from config/initializers/005-site_settings.rb rename to config/initializers/004-site_settings.rb diff --git a/config/initializers/004-message_bus.rb b/config/initializers/005-message_bus.rb similarity index 100% rename from config/initializers/004-message_bus.rb rename to config/initializers/005-message_bus.rb