From 809b7f8b3dcba4b146012c7e3491462990f477e0 Mon Sep 17 00:00:00 2001 From: Lukas Eipert Date: Mon, 22 Jul 2019 15:00:08 +0200 Subject: Resolve difference in app/assets/stylesheets/application.scss --- config/application.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config/application.rb') diff --git a/config/application.rb b/config/application.rb index de386506233..ffc8c616f89 100644 --- a/config/application.rb +++ b/config/application.rb @@ -183,6 +183,12 @@ module Gitlab config.assets.precompile << "pages/jira_connect.css" end + # Import path for EE specific SCSS entry point + # In CE it will import a noop file, in EE a functioning file + # Order is important, so that the ee file takes precedence: + config.assets.paths << "#{config.root}/ee/app/assets/stylesheets/_ee" + config.assets.paths << "#{config.root}/app/assets/stylesheets/_ee" + config.assets.paths << "#{config.root}/vendor/assets/javascripts/" config.assets.precompile << "snowplow/sp.js" -- cgit v1.2.3