kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

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

See merge request gitlab-org/gitlab-ce!31007
This commit is contained in:
Phil Hughes 2019-07-23 08:18:02 +00:00
commit 865b24dabe
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/_ee/application_ee.scss Normal file
View file

@ -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
*/

4
app/assets/stylesheets/application.scss
View file

@ -34,4 +34,8 @@
// Styles for JS behaviors. // Styles for JS behaviors.
@import "behaviors"; @import "behaviors";
// EE-only stylesheets
@import "application_ee";
// CSS util classes
@import "utilities"; @import "utilities";

6
config/application.rb
View file

@ -182,6 +182,12 @@ module Gitlab
config.assets.precompile << "pages/jira_connect.css" config.assets.precompile << "pages/jira_connect.css"
end 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.paths << "#{config.root}/vendor/assets/javascripts/"
config.assets.precompile << "snowplow/sp.js" config.assets.precompile << "snowplow/sp.js"