diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-07-22 14:45:14 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-07-22 14:45:14 -0500 |
| commit | 4b84e1c40d4f7e91cd53ee683d8309e6da947b6f (patch) | |
| tree | 8bbb9a409018259bdcf41e2728f153db0dfbd553 | |
| parent | 3cc5535c0c7a52c93b00c1a1260eb8d828a3e9dc (diff) | |
| download | gitlab-ce-4b84e1c40d4f7e91cd53ee683d8309e6da947b6f.tar.gz | |
Fix xterm CSS not loading
| -rw-r--r-- | config/application.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index de386506233..aaf57e8f6a9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -168,7 +168,6 @@ module Gitlab # Import gitlab-svgs directly from vendored directory 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.json" config.assets.precompile << "illustrations/*.svg" @@ -186,6 +185,10 @@ module Gitlab config.assets.paths << "#{config.root}/vendor/assets/javascripts/" 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 # 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| |