diff options
| author | Lukas Eipert <leipert@gitlab.com> | 2019-07-22 16:00:08 +0300 |
|---|---|---|
| committer | Lukas Eipert <leipert@gitlab.com> | 2019-07-22 16:04:08 +0300 |
| commit | 809b7f8b3dcba4b146012c7e3491462990f477e0 (patch) | |
| tree | dccc9e0ae28c57fd248bedc9592369f51db994d2 /config/application.rb | |
| parent | 886a6957ec0d981426219f42d75e0af145a9f7cf (diff) | |
Resolve difference in app/assets/stylesheets/application.scss
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index de386506233..ffc8c616f89 100644 --- a/config/application.rb +++ b/config/application.rb @@ -183,6 +183,12 @@ module Gitlab config.assets.precompile << "pages/jira_connect.css" end + # Import path for EE specific SCSS entry point + # In CE it will import a noop file, in EE a functioning file + # Order is important, so that the ee file takes precedence: + config.assets.paths << "#{config.root}/ee/app/assets/stylesheets/_ee" + config.assets.paths << "#{config.root}/app/assets/stylesheets/_ee" + config.assets.paths << "#{config.root}/vendor/assets/javascripts/" config.assets.precompile << "snowplow/sp.js" |