diff options
| author | Simon Knox <psimyn@gmail.com> | 2019-03-14 18:48:50 +1100 |
|---|---|---|
| committer | Enrique Alcantara <ealcantara@gitlab.com> | 2019-06-17 14:38:28 -0400 |
| commit | b8a0f1e646ef3c37d73def402225b5acc8051b09 (patch) | |
| tree | 5cc5e7d47fc31f130a663a3c0a6095bf9be322a1 /config/application.rb | |
| parent | d2929d6edb3a04054a5218cb1b21cb0759ec1ec8 (diff) | |
| download | gitlab-ce-b8a0f1e646ef3c37d73def402225b5acc8051b09.tar.gz | |
Import bootstrap styles from gitlab-ui
Use gitlab_ui.scss instead of all the bootstrap imports
Allow the ../node_modules path from gitlab_ui.scss to resolve
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index cddd91f267a..c4831b1e638 100644 --- a/config/application.rb +++ b/config/application.rb @@ -153,6 +153,7 @@ 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" |