Commit a39de17e authored by Thong Kuah's avatar Thong Kuah

Fix regression for EE asset paths

parent 99fb4cbd
...@@ -209,6 +209,13 @@ module Gitlab ...@@ -209,6 +209,13 @@ module Gitlab
config.assets.paths << "#{config.root}/node_modules/xterm/src/" config.assets.paths << "#{config.root}/node_modules/xterm/src/"
config.assets.precompile << "xterm.css" config.assets.precompile << "xterm.css"
# Add EE assets
if Gitlab.ee?
%w[images javascripts stylesheets].each do |path|
config.assets.paths << "#{config.root}/ee/app/assets/#{path}"
end
end
# Import path for EE specific SCSS entry point # Import path for EE specific SCSS entry point
# In CE it will import a noop file, in EE a functioning file # In CE it will import a noop file, in EE a functioning file
# Order is important, so that the ee file takes precedence: # Order is important, so that the ee file takes precedence:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment