summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-07-22 21:35:30 +0000
committerStan Hu <stanhu@gmail.com>2019-07-22 21:35:30 +0000
commit9881aa08bfe68224e7d37b5721ee4b026d94f739 (patch)
tree5e311da8def97c9d5dbb6e19e54a6ded5510687f
parentc0c3e7c74da6b6f2387a227f7dfeee227fba2938 (diff)
parent64d1684498e11b1e2196ceb3c4911f26a9f2d624 (diff)
downloadgitlab-ce-9881aa08bfe68224e7d37b5721ee4b026d94f739.tar.gz
Merge branch '64091-fix-sprockets-paths' into 'master'
Fix xterm CSS not loading Closes #64091 See merge request gitlab-org/gitlab-ce!31023
-rw-r--r--changelogs/unreleased/64091-fix-sprockets-paths.yml5
-rw-r--r--config/application.rb5
2 files changed, 9 insertions, 1 deletions
diff --git a/changelogs/unreleased/64091-fix-sprockets-paths.yml b/changelogs/unreleased/64091-fix-sprockets-paths.yml
new file mode 100644
index 00000000000..fcd8b2faa49
--- /dev/null
+++ b/changelogs/unreleased/64091-fix-sprockets-paths.yml
@@ -0,0 +1,5 @@
+---
+title: Fix xterm css not loading for environment terminal
+merge_request: 31023
+author:
+type: fixed
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|