Merge branch '6544-remove-scss-diff-ce' into 'master'

Resolve difference in app/assets/stylesheets/application.scss

See merge request gitlab-org/gitlab-ce!31007

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 aaf57e8f6a9..df5079ba993 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -182,6 +182,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"