diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
| commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
| tree | 78be5963ec075d80116a932011d695dd33910b4e /config/application.rb | |
| parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 772b3b042c1..3fd9ce39bb9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -169,6 +169,8 @@ module Gitlab config.assets.precompile << "application_dark.css" + config.assets.precompile << "startup/*.css" + config.assets.precompile << "print.css" config.assets.precompile << "mailer.css" config.assets.precompile << "mailer_client_specific.css" @@ -192,6 +194,11 @@ module Gitlab config.assets.precompile << "icons.json" config.assets.precompile << "illustrations/*.svg" + # Import Fontawesome fonts + config.assets.paths << "#{config.root}/node_modules/font-awesome/fonts" + config.assets.precompile << "fontawesome-webfont.woff2" + config.assets.precompile << "fontawesome-webfont.woff" + # Import css for xterm config.assets.paths << "#{config.root}/node_modules/xterm/src/" config.assets.precompile << "xterm.css" |