diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-07-22 21:35:30 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-07-30 15:25:37 +0000 |
| commit | a4f006ec52577d9132ba146bef88338ebd7b4155 (patch) | |
| tree | a70922c6457638e6f06c559bb24bd41122fb09df | |
| parent | 2bb8300f5d10df6696a397fa2a022f2b8116b7b9 (diff) | |
| download | gitlab-ce-a4f006ec52577d9132ba146bef88338ebd7b4155.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
(cherry picked from commit 9881aa08bfe68224e7d37b5721ee4b026d94f739)
4b84e1c4 Fix xterm CSS not loading
64d16844 Add CHANGELOG.md entry
| -rw-r--r-- | changelogs/unreleased/64091-fix-sprockets-paths.yml | 5 | ||||
| -rw-r--r-- | config/application.rb | 5 |
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| |