diff --git a/config/site_settings.yml b/config/site_settings.yml index d08c5bc1be9..b9f59503b9f 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -365,9 +365,6 @@ basic: default: "arial" enum: "BaseFontSetting" refresh: true - order_stylesheets: - default: false - hidden: true login: invite_only: diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb index 3cb2254e7bc..7283e777700 100644 --- a/lib/stylesheet/manager.rb +++ b/lib/stylesheet/manager.rb @@ -231,7 +231,7 @@ class Stylesheet::Manager stylesheets << data end - if SiteSetting.order_stylesheets && stylesheets.size > 1 + if stylesheets.size > 1 stylesheets = stylesheets.sort_by do |s| [ s[:remote] ? 0 : 1, diff --git a/spec/components/stylesheet/manager_spec.rb b/spec/components/stylesheet/manager_spec.rb index 8100893a378..219036ee07d 100644 --- a/spec/components/stylesheet/manager_spec.rb +++ b/spec/components/stylesheet/manager_spec.rb @@ -152,10 +152,6 @@ describe Stylesheet::Manager do end end - before do - SiteSetting.order_stylesheets = true - end - it 'output remote child, then sort children alphabetically, then local parent' do theme.add_relative_theme!(:child, z_child_theme) theme.add_relative_theme!(:child, child_remote)