Commit 4b84e1c4 authored by Mike Greiling's avatar Mike Greiling

Fix xterm CSS not loading

parent 3cc5535c
...@@ -168,7 +168,6 @@ module Gitlab ...@@ -168,7 +168,6 @@ module Gitlab
# Import gitlab-svgs directly from vendored directory # Import gitlab-svgs directly from vendored directory
config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist" config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist"
config.assets.paths << "#{config.root}/node_modules"
config.assets.precompile << "icons.svg" config.assets.precompile << "icons.svg"
config.assets.precompile << "icons.json" config.assets.precompile << "icons.json"
config.assets.precompile << "illustrations/*.svg" config.assets.precompile << "illustrations/*.svg"
...@@ -186,6 +185,10 @@ module Gitlab ...@@ -186,6 +185,10 @@ module Gitlab
config.assets.paths << "#{config.root}/vendor/assets/javascripts/" config.assets.paths << "#{config.root}/vendor/assets/javascripts/"
config.assets.precompile << "snowplow/sp.js" config.assets.precompile << "snowplow/sp.js"
# This path must come last to avoid confusing sprockets
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/64091#note_194512508
config.assets.paths << "#{config.root}/node_modules"
# Compile non-JS/CSS assets in the ee/app/assets folder by default # Compile non-JS/CSS assets in the ee/app/assets folder by default
# Mimic sprockets-rails default: https://github.com/rails/sprockets-rails/blob/v3.2.1/lib/sprockets/railtie.rb#L84-L87 # Mimic sprockets-rails default: https://github.com/rails/sprockets-rails/blob/v3.2.1/lib/sprockets/railtie.rb#L84-L87
LOOSE_EE_APP_ASSETS = lambda do |logical_path, filename| LOOSE_EE_APP_ASSETS = lambda do |logical_path, filename|
......
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