diff options
| author | Igor <idrozdov@gitlab.com> | 2019-08-05 15:06:02 +0000 |
|---|---|---|
| committer | Igor <idrozdov@gitlab.com> | 2019-08-05 15:06:02 +0000 |
| commit | 7efb062c3c3c7b44113d0dc0fe78fc9b8e95bd7c (patch) | |
| tree | a12bde9bbeffcc0c365d3a29339d0389dcefdd8f /config/application.rb | |
| parent | 2bd1320f86b8cfd5d60199c5f7f0caa1cc2aa66b (diff) | |
| parent | 3dfc89ade452ad7f0185653b30ed1d4bb2544fb0 (diff) | |
| download | gitlab-ce-id-test-codeowners.tar.gz | |
Merge branch 'master' into 'id-test-codeowners'id-test-codeowners
# Conflicts:
# .gitlab/CODEOWNERS
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/config/application.rb b/config/application.rb index de386506233..92240426b5a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,11 +22,6 @@ module Gitlab require_dependency Rails.root.join('lib/gitlab/middleware/read_only') require_dependency Rails.root.join('lib/gitlab/middleware/basic_health_check') - # This needs to be loaded before DB connection is made - # to make sure that all connections have NO_ZERO_DATE - # setting disabled - require_dependency Rails.root.join('lib/mysql_zero_date') - # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. @@ -168,7 +163,6 @@ module Gitlab # Import gitlab-svgs directly from vendored directory config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist" - config.assets.paths << "#{config.root}/node_modules" config.assets.precompile << "icons.svg" config.assets.precompile << "icons.json" config.assets.precompile << "illustrations/*.svg" @@ -183,9 +177,19 @@ 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" + # This path must come last to avoid confusing sprockets + # See https://gitlab.com/gitlab-org/gitlab-ce/issues/64091#note_194512508 + config.assets.paths << "#{config.root}/node_modules" + # Compile non-JS/CSS assets in the ee/app/assets folder by default # Mimic sprockets-rails default: https://github.com/rails/sprockets-rails/blob/v3.2.1/lib/sprockets/railtie.rb#L84-L87 LOOSE_EE_APP_ASSETS = lambda do |logical_path, filename| |