summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-08-03 13:41:33 +0100
committerFilipa Lacerda <filipa@gitlab.com>2018-08-03 14:26:23 +0100
commit0116930bb0ae30bcb7b43b87371f1418e74661f1 (patch)
treefd6ff8d279767b67649109fc7c8e1fb0c2f6e6bc /config/application.rb
parent77c189a9a7687849eac438a2850c6a106b371399 (diff)
downloadgitlab-ce-0116930bb0ae30bcb7b43b87371f1418e74661f1.tar.gz
Uses npm css and removes css from vendor folder
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb
index a086e860e16..222080c16fb 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"
+ 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'