FIX: Order outputted theme stylesheets (#14133)

This commit is contained in:
Penar Musaraj 2021-08-24 21:37:07 -04:00 committed by GitHub
parent d88c9d8cd1
commit 1167b16913
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 8 deletions

View File

@ -365,9 +365,6 @@ basic:
default: "arial"
enum: "BaseFontSetting"
refresh: true
order_stylesheets:
default: false
hidden: true
login:
invite_only:

View File

@ -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,

View File

@ -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)