diff options
| author | Lukas Eipert <leipert@gitlab.com> | 2019-07-22 15:00:08 +0200 |
|---|---|---|
| committer | Lukas Eipert <leipert@gitlab.com> | 2019-07-22 15:04:08 +0200 |
| commit | 809b7f8b3dcba4b146012c7e3491462990f477e0 (patch) | |
| tree | dccc9e0ae28c57fd248bedc9592369f51db994d2 | |
| parent | 886a6957ec0d981426219f42d75e0af145a9f7cf (diff) | |
| download | gitlab-ce-6544-remove-scss-diff-ce.tar.gz | |
Resolve difference in app/assets/stylesheets/application.scss6544-remove-scss-diff-ce
| -rw-r--r-- | app/assets/stylesheets/_ee/application_ee.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 4 | ||||
| -rw-r--r-- | config/application.rb | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/app/assets/stylesheets/_ee/application_ee.scss b/app/assets/stylesheets/_ee/application_ee.scss new file mode 100644 index 00000000000..0fb2c9b68a9 --- /dev/null +++ b/app/assets/stylesheets/_ee/application_ee.scss @@ -0,0 +1,5 @@ +/* + This is a noop-file. In EE: + ee/app/assets/stylesheets/_ee/application_ee.scss + will take precedence over it and import more styles + */ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index d5ef66af31a..fbf16aa324a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -34,4 +34,8 @@ // Styles for JS behaviors. @import "behaviors"; +// EE-only stylesheets +@import "application_ee"; + +// CSS util classes @import "utilities"; 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" |