diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-22 09:21:03 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-22 09:21:03 +0000 |
| commit | 45b3513f12570e367b6ee4e49306cb6115f97c5f (patch) | |
| tree | 7da095db39b4a0c0530c58f17df553dbf1aac7ab /config | |
| parent | 321e26f34d7a13594dd5e63734bcb6577e389925 (diff) | |
| parent | a1e0f387bfc7c01e41c487b598c3828fa89da397 (diff) | |
| download | gitlab-ce-45b3513f12570e367b6ee4e49306cb6115f97c5f.tar.gz | |
Merge branch '56873-only-load-syntax-highlighting-css-when-selected' into 'master'
Resolve "Only load syntax highlighting css when selected"
Closes #57739 and #56873
See merge request gitlab-org/gitlab-ce!25232
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 49e7f5836e4..1c11e347281 100644 --- a/config/application.rb +++ b/config/application.rb @@ -147,6 +147,8 @@ module Gitlab config.assets.precompile << "errors.css" config.assets.precompile << "csslab.css" + config.assets.precompile << "highlight/themes/*.css" + # Import gitlab-svgs directly from vendored directory config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist" config.assets.precompile << "icons.svg" |