diff options
| author | Phil Hughes <me@iamphill.com> | 2018-08-06 07:24:18 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-08-06 07:24:18 +0000 |
| commit | 313b79d87bd65864307e6864080e12bdbab7c4ab (patch) | |
| tree | 268c166ede844b836141f9d273e43679b00348e2 /config | |
| parent | 30c960d4eee9a4814e593abef8e13cd52914bd88 (diff) | |
| parent | 26b8209ecdef4bb8c94b7fa3aa2fca7281de5e2b (diff) | |
| download | gitlab-ce-313b79d87bd65864307e6864080e12bdbab7c4ab.tar.gz | |
Merge branch '25990-improve-web-terminal' into 'master'
Move xterm to a node dependency and remove it from vendor's folder
Closes #49741
See merge request gitlab-org/gitlab-ce!20588
Diffstat (limited to 'config')
| -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 a086e860e16..76a2c47a750 100644 --- a/config/application.rb +++ b/config/application.rb @@ -133,7 +133,6 @@ module Gitlab config.assets.precompile << "print.css" config.assets.precompile << "notify.css" config.assets.precompile << "mailers/*.css" - config.assets.precompile << "xterm/xterm.css" config.assets.precompile << "page_bundles/ide.css" config.assets.precompile << "performance_bar.css" config.assets.precompile << "lib/ace.js" @@ -149,6 +148,10 @@ module Gitlab config.assets.precompile << "icons.json" config.assets.precompile << "illustrations/*.svg" + # Import css for xterm + config.assets.paths << "#{config.root}/node_modules/xterm/src/" + config.assets.precompile << "xterm.css" + # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' |