summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-07-23 08:18:02 +0000
committerPhil Hughes <me@iamphill.com>2019-07-23 08:18:02 +0000
commit865b24dabe543732837f916d554330c13b9a7850 (patch)
treefc31dd340bb768888cbe25a8372f53978bd9fde3 /config
parente2b1af2064514a34081f1aac9e247667a0dc2442 (diff)
parent809b7f8b3dcba4b146012c7e3491462990f477e0 (diff)
downloadgitlab-ce-865b24dabe543732837f916d554330c13b9a7850.tar.gz
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
Diffstat (limited to 'config')
-rw-r--r--config/application.rb6
1 files changed, 6 insertions, 0 deletions
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"