FIX: Order outputted theme stylesheets (#14133)

FIX: Order outputted theme stylesheets (#14133)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index d08c5bc..b9f5950 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 3cb2254..7283e77 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 8100893..219036e 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)

GitHub sha: 1167b16913399d709c716bc0dc9aaf44a277dbbc

This commit appears in #14133 which was approved by eviltrout and tgxworld. It was merged by tgxworld.