diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-18 10:02:33 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-18 10:02:33 +0000 |
| commit | 28fe2a67d00938ac504fb1838ed4c42931880c2e (patch) | |
| tree | 2f757e7b8ab55bbd0b0e625a771d6e09efc239f8 /config | |
| parent | c7b72a6ee4e271906a4087b1ec6c818200dd7e07 (diff) | |
| parent | 676743b9b5da47b9b596c3169aa9af418d1af1ea (diff) | |
| download | gitlab-ce-28fe2a67d00938ac504fb1838ed4c42931880c2e.tar.gz | |
Merge branch 'bootstrap-to-glui' into 'master'
Import bootstrap styles from gitlab-ui
See merge request gitlab-org/gitlab-ce!26165
Diffstat (limited to 'config')
| -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 2c4aa7bf758..c5ef6a2c60d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -166,6 +166,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" |